install stage 1 and grub-config: make it so the UUID of /container ends up on the kernel command line

master
BodgeMaster 2023-06-28 14:04:07 +02:00
parent 7aafaf172e
commit 22e3ede566
2 changed files with 3 additions and 4 deletions

View File

@ -188,7 +188,7 @@ echo "%wheel ALL=(ALL:ALL) ALL" > /mnt/target/etc/sudoers.d/wheel_as_sudo_group.
mkdir -p /mnt/target/opt/void-usb mkdir -p /mnt/target/opt/void-usb
chmod 755 /mnt/target/opt/void-usb chmod 755 /mnt/target/opt/void-usb
echo "UUID=$(blkid --output value --match-tag UUID $TARGET_PART_BIG) /container f2fs defaults,rw,nodev,nosuid 0 1" > /mnt/target/opt/void-usb/initramfs-fstab echo "UUID=$(blkid --output value --match-tag UUID $TARGET_PART_BIG)" > /mnt/target/opt/void-usb/container
echo '# Void USB dracut configuration echo '# Void USB dracut configuration
@ -196,8 +196,7 @@ hostonly="no"
compress="xz" compress="xz"
add_dracutmodules+=" void-usb " add_dracutmodules+=" void-usb "
omit_dracutmodules+=" nvdimm resume " omit_dracutmodules+=" nvdimm resume "' > /mnt/target/etc/dracut.conf.d/99-void-usb.conf
add_fstab+=" /opt/void-usb/initramfs-fstab "' > /mnt/target/etc/dracut.conf.d/99-void-usb.conf
#TODO: mount /container #TODO: mount /container
mkdir -p /mnt/target/lib/dracut/modules.d/90void-usb mkdir -p /mnt/target/lib/dracut/modules.d/90void-usb

View File

@ -4,7 +4,7 @@ OS_NAME="Void Linux USB"
GRUB_PREFIX="/boot/efi/LOADER/grub" GRUB_PREFIX="/boot/efi/LOADER/grub"
CFG_CUSTOM_BEFORE="custom_before.cfg" CFG_CUSTOM_BEFORE="custom_before.cfg"
CFG_CUSTOM_AFTER="custom_after.cfg" CFG_CUSTOM_AFTER="custom_after.cfg"
LINUX_CMDLINE="root=/dev/loop0 ro" LINUX_CMDLINE="root=/dev/loop0 ro void-usb-container=$(cat /opt/void-usb/container)"
DEFAULT_LINUX=/boot/vmlinu? DEFAULT_LINUX=/boot/vmlinu?
if [ ! -f "$DEFAULT_LINUX" ]; then if [ ! -f "$DEFAULT_LINUX" ]; then