commit b0088be90b5c4220ae8f2fa40071a0a6cc5ac7de parent 30d57f6b6dc568a2817086e5762216aabbf042c0 Author: awy <awy@awy.one> Date: Thu, 10 Apr 2025 15:42:03 +0300 uuid instead of partuuid Diffstat:
| M | post_chroot.sh | | | 10 | +++++----- |
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/post_chroot.sh b/post_chroot.sh @@ -20,19 +20,19 @@ export LC_COLLATE="C" echo "$hostname" > /etc/hostname -PARTUUID_ROOT=$(blkid -s PARTUUID -o value /dev/"$rootdrive") -PARTUUID_CRYPTROOT=$(blkid -s PARTUUID -o value /dev/mapper/cryptlvm) +UUID_ROOT=$(blkid -s UUID -o value /dev/"$rootdrive") +UUID_CRYPTROOT=$(blkid -s UUID -o value /dev/mapper/cryptlvm) binkernel() { pacman -S grub os-prober efibootmgr --noconfirm echo "options hid_apple fnmode=0" > /etc/modprobe.d/hid_apple.conf if [ "$encryption" = 1 ]; then - sed -i "s#GRUB_CMDLINE_LINUX_DEFAULT=.*#GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet options cryptdevice=PARTUUID=$PARTUUID_ROOT:cryptlvm root=PARTUUID=$PARTUUID_CRYPTROOT rw intel_iommu=on\"#g" /etc/default/grub + sed -i "s#GRUB_CMDLINE_LINUX_DEFAULT=.*#GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet options cryptdevice=UUID=$UUID_ROOT:cryptlvm root=UUID=$UUID_CRYPTROOT rw intel_iommu=on\"#g" /etc/default/grub sed -i "s#HOOKS=.*#HOOKS=(base udev autodetect microcode modconf keyboard keymap consolefont block encrypt lvm2 filesystems fsck)#g" /etc/mkinitcpio.conf sed -i "/^#GRUB_ENABLE_CRYPTODISK/s/^#//" /etc/default/grub else - sed -i "s#GRUB_CMDLINE_LINUX_DEFAULT=.*#GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet options root=PARTUUID=$PARTUUID_ROOT rw intel_iommu=on\"#g" /etc/default/grub + sed -i "s#GRUB_CMDLINE_LINUX_DEFAULT=.*#GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet options root=UUID=$UUID_ROOT rw intel_iommu=on\"#g" /etc/default/grub sed -i "s#HOOKS=.*#HOOKS=(base udev autodetect microcode modconf keyboard keymap consolefont block filesystems fsck)#g" /etc/mkinitcpio.conf fi case $kerneltype in @@ -56,7 +56,7 @@ customkernel() mv "linux-$latestkernel" "linux" cd "linux" mv /usr/src/.config .config - sed -i -e '/^CONFIG_CMDLINE="root=PARTUUID=.*/c\' -e "CONFIG_CMDLINE=\"root=PARTUUID=$PARTUUID_ROOT init=/sbin/dinit-init\"" .config + sed -i -e '/^CONFIG_CMDLINE="root=UUID=.*/c\' -e "CONFIG_CMDLINE=\"root=UUID=$UUID_ROOT init=/sbin/dinit-init\"" .config pacman -S bc perl bison make diffutils gcc flex rsync --noconfirm make olddefconfig make menuconfig