BodgeMaster
/
void-usb
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: BodgeMaster:1ac7006dfab5ee7305b4b319d57ac4881544d709
Branches Tags
BodgeMaster:master
..
compare: BodgeMaster:4b2749b2a5fed50d6db0d68800061f4c955c04e5
Branches Tags
BodgeMaster:master

No commits in common. "1ac7006dfab5ee7305b4b319d57ac4881544d709" and "4b2749b2a5fed50d6db0d68800061f4c955c04e5" have entirely different histories.
1ac7006dfa ... 4b2749b2a5

2 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

3
install-stage1.sh
View File

@ -186,7 +186,7 @@ if yesno; then
echo -n "Formatting partitions... " echo -n "Formatting partitions... "
mkfs.vfat -F32 -n "EFIBOOT" "$TARGET_PART_EFI" >> $LOGFILE 2>&1 mkfs.vfat -F32 -n "EFIBOOT" "$TARGET_PART_EFI" >> $LOGFILE 2>&1
mkfs.f2fs -f -l "boot" "$TARGET_PART_BOOT" >> $LOGFILE 2>&1 mkfs.f2fs -f -l "container" "$TARGET_PART_BOOT" >> $LOGFILE 2>&1
echo "Setting up encryption. You will be asked for the same password twice." echo "Setting up encryption. You will be asked for the same password twice."
cryptsetup luksFormat --batch-mode --type luks2 --force-password "$TARGET_PART_BIG" cryptsetup luksFormat --batch-mode --type luks2 --force-password "$TARGET_PART_BIG"
DEV_MAPPER_NAME="luks-$(blkid --output value --match-tag UUID "$TARGET_PART_BIG")" DEV_MAPPER_NAME="luks-$(blkid --output value --match-tag UUID "$TARGET_PART_BIG")"
@ -195,7 +195,6 @@ if yesno; then
echo "Failed to open encrypted container. The entered passwords probably didn't match." echo "Failed to open encrypted container. The entered passwords probably didn't match."
exit 1 exit 1
fi fi
mkfs.f2fs -f -l "container" /dev/mapper/"$DEV_MAPPER_NAME" >> $LOGFILE 2>&1
echo "done" echo "done"
echo -n "Mounting partitions and virtual file systems... " echo -n "Mounting partitions and virtual file systems... "

2
opt/grub-config
View File

@ -13,7 +13,7 @@ else
fi fi
VOIDUSB_CONTAINER="$(findmnt --noheadings --output SOURCE /run/void-usb/container)" VOIDUSB_CONTAINER="$(findmnt --noheadings --output SOURCE /run/void-usb/container)"
if grep "/dev/mapper" <<< "$VOIDUSB_CONTAINER" > /dev/null; then if grep "/dev/mapper" <<< "$VOIDUSB_CONTAINER" > /dev/null; then
LUKS_SETTINGS="rd.luks.uuid=$(blkid --output value --match-tag UUID /dev/"$(ls /sys/block/"$(basename "$(realpath "$VOIDUSB_CONTAINER")")"/slaves | head -n1)")" LUKS_SETTINGS="rd.luks.uuid=$(blkid --output value --match-tag UUID "$(ls /sys/block/"$(basename "$(realpath "$VOIDUSB_CONTAINER")")"/slaves | head -n1)")"
else else
VOIDUSB_CONTAINER="UUID=$(blkid --output value --match-tag UUID "$VOIDUSB_CONTAINER")" VOIDUSB_CONTAINER="UUID=$(blkid --output value --match-tag UUID "$VOIDUSB_CONTAINER")"
fi fi