Le0xFF/VoidLinuxInstaller
1
1
Fork 0
mirror of https://github.com/Le0xFF/VoidLinuxInstaller.git synced 2024-11-25 18:54:13 +03:00
Code Issues Projects Releases Wiki Activity

Fix fstab creation while in chroot and cosmetic changes

Browse Source
This commit is contained in:
Le0xFF 2022-07-27 15:26:17 +02:00
parent f46aac7128
commit 3226e29606
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vli.sh
View File

@ -100,12 +100,13 @@ function edit_fstab {
export LUKS_UUID=\$(blkid -s UUID -o value "\$encrypted_partition") export LUKS_UUID=\$(blkid -s UUID -o value "\$encrypted_partition")
if [[ "\$lvm_yn" == "y" ]] || [[ "\$lvm_yn" == "Y" ]] ; then if [[ "\$lvm_yn" == "y" ]] || [[ "\$lvm_yn" == "Y" ]] ; then
export ROOT_UUID=\$(blkid -s UUID -o value /dev/mapper/"\$vg_name"-"\$lv_root_name") export ROOT_UUID=\$(blkid -s UUID -o value /dev/mapper/"\$vg_name"-"\$lv_root_name")
elif [[ "\$lvm_yn" == "n" ]] || [[ "\$lvm_yn" == "N" ]] ; then
export ROOT_UUID=\$(blkid -s UUID -o value /dev/mapper/"\$encrypted_name")
fi fi
echo -e -n "\nWriting fstab...\n\n" echo -e -n "\nWriting fstab...\n\n"
sed -i '/tmpfs/d' /etc/fstab sed -i '/tmpfs/d' /etc/fstab
if [[ "\$lvm_yn" == "y" ]] || [[ "\$lvm_yn" == "Y" ]] ; then
cat << EOF >> /etc/fstab cat << EOF >> /etc/fstab
# root partition # root partition
@ -124,27 +125,6 @@ UUID=\$UEFI_UUID /boot/efi vfat defaults,noatime 0 2
tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0 tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0
EOF EOF
elif [[ "\$lvm_yn" == "n" ]] || [[ "\$lvm_yn" == "N" ]] ; then
cat << EOF >> /etc/fstab
# root partition
UUID=\$LUKS_UUID / btrfs \$BTRFS_OPT,subvol=@ 0 1
# home partition
UUID=\$LUKS_UUID /home btrfs \$BTRFS_OPT,subvol=@home 0 2
# root snapshots, uncomment the following line after creating a config for root in snapper
#UUID=\$LUKS_UUID /.snapshots btrfs \$BTRFS_OPT,subvol=@snapshots 0 2
# EFI partition
UUID=\$UEFI_UUID /boot/efi vfat defaults,noatime 0 2
# TMPfs
tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0
EOF
fi
read -n 1 -r -p "[Press any key to continue...]" key read -n 1 -r -p "[Press any key to continue...]" key
clear clear
@ -234,9 +214,10 @@ EOF
echo -e -n "\nInstalling GRUB on \${BLUE_LIGHT}/boot/efi\${NORMAL} partition with \${BLUE_LIGHT}VoidLinux\${NORMAL} as bootloader-id...\n\n" echo -e -n "\nInstalling GRUB on \${BLUE_LIGHT}/boot/efi\${NORMAL} partition with \${BLUE_LIGHT}VoidLinux\${NORMAL} as bootloader-id...\n\n"
grub-install --target=x86_64-efi --boot-directory=/boot --efi-directory=/boot/efi --bootloader-id=VoidLinux --recheck grub-install --target=x86_64-efi --boot-directory=/boot --efi-directory=/boot/efi --bootloader-id=VoidLinux --recheck
if [[ "\$lvm_yn" == "y" ]] || [[ "\$lvm_yn" == "Y" ]] ; then
echo -e -n "\nEnabling SSD trim for LVM...\n\n" echo -e -n "\nEnabling SSD trim for LVM...\n\n"
sed -i 's/issue_discards = 0/issue_discards = 1/' /etc/lvm/lvm.conf sed -i 's/issue_discards = 0/issue_discards = 1/' /etc/lvm/lvm.conf
fi
read -n 1 -r -p "[Press any key to continue...]" key read -n 1 -r -p "[Press any key to continue...]" key
clear clear
@ -924,12 +905,14 @@ function lvm_creation {
header_lc header_lc
echo -e -n "\nWith LVM will be easier in the future\nto add more space to the root partition without formatting the whole system\n" echo -e -n "\nWith LVM will be easier in the future to add more space\nto the root partition without formatting the whole system\n"
echo -e -n "\nDo you want to use ${BLUE_LIGHT}LVM${NORMAL}? (y/n): " echo -e -n "\nDo you want to use ${BLUE_LIGHT}LVM${NORMAL}? (y/n): "
read -r lvm_yn read -n 1 -r lvm_yn
if [[ "$lvm_yn" == "y" ]] || [[ "$lvm_yn" == "Y" ]] ; then if [[ "$lvm_yn" == "y" ]] || [[ "$lvm_yn" == "Y" ]] ; then
clear
while true ; do while true ; do
header_lc header_lc
@ -1009,7 +992,7 @@ function lvm_creation {
done done
elif [[ "$lvm_yn" == "n" ]] || [[ "$lvm_yn" == "N" ]] ; then elif [[ "$lvm_yn" == "n" ]] || [[ "$lvm_yn" == "N" ]] ; then
echo -e -n "\n\nLVM won't be used.\n\n" echo -e -n "\nLVM won't be used.\n\n"
read -n 1 -r -p "[Press any key to continue...]" key read -n 1 -r -p "[Press any key to continue...]" key
clear clear
break break
@ -1208,7 +1191,6 @@ function create_btrfs_subvolumes {
echo -e -n "\n\nThe root partition you selected (/dev/mapper/$encrypted_name) will now be mounted to /mnt.\n" echo -e -n "\n\nThe root partition you selected (/dev/mapper/$encrypted_name) will now be mounted to /mnt.\n"
fi fi
echo -e -n "\n\nThe root partition you selected (/dev/mapper/$vg_name-$lv_root_name) will now be mounted to /mnt.\n"
if grep -q /mnt /proc/mounts ; then if grep -q /mnt /proc/mounts ; then
echo -e -n "Everything mounted to /mnt will now be unmounted...\n" echo -e -n "Everything mounted to /mnt will now be unmounted...\n"
cd "$HOME" cd "$HOME"