From b8b395249902370ad432e83183911e58fcc00504 Mon Sep 17 00:00:00 2001 From: awy Date: Wed, 7 Aug 2024 21:40:49 +0300 Subject: small fixes --- install.sh | 6 +++++- post_chroot.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 5c4de70..adaa8bd 100755 --- a/install.sh +++ b/install.sh @@ -32,6 +32,9 @@ mount /dev/$root_drive /mnt mkdir /mnt/boot mkdir /mnt/home +UUID_ROOT=$(blkid -s UUID -o value $root_drive) +UUID_BOOT=$(blkid -s UUID -o value $boot_drive) + if [ "$_kernelflag" -eq 1 ]; then mkdir /mnt/boot/efi mount /dev/$boot_drive /mnt/boot/efi @@ -45,7 +48,8 @@ elif [ "$_kernelflag" -eq 2 ]; then rc-service ntpd start pacman -Sy --confirm basestrap /mnt base openrc seatd-openrc udev intel-ucode - fstabgen -U /mnt >> /mnt/etc/fstab + echo "UUID=$UUID_BOOT /boot vfat defaults,noatime 0 2 + UUID=$UUID_ROOT / ext4 defaults,noatime 0 1" > /etc/fstab cp post_chroot.sh /mnt else printf ${LIGHTRED}"Wrong kernelflag value.${NoColor}\n" diff --git a/post_chroot.sh b/post_chroot.sh index a03eb7e..db0d456 100755 --- a/post_chroot.sh +++ b/post_chroot.sh @@ -31,7 +31,8 @@ elif [ "$_kernelflag" -eq 2 ]; then curl -LO "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.10.3.tar.xz" tar -xf "linux-6.10.3.tar.xz" rm -f "linux-6.10.3.tar.xz" - cd "linux-6.10.3" + mv "linux-6.10.3" "linux" + cd "linux" curl -LO "https://codeberg.org/awy/artix/raw/branch/minimal/.config" sed -i -e '/^CONFIG_CMDLINE="root=PARTUUID=.*/c\' -e "CONFIG_CMDLINE=\"root=PARTUUID=$PARTUUID_ROOT init=/sbin/openrc-init nvidia_drm.modeset=1 nvidia_drm.fbdev=1 intel_iommu=on\"" .config pacman -S bc perl bison make diffutils gcc flex rsync --noconfirm @@ -44,7 +45,6 @@ elif [ "$_kernelflag" -eq 2 ]; then make headers_install mkdir -p /boot/EFI/BOOT cp arch/x86/boot/bzImage /boot/EFI/BOOT/BOOTX64.EFI - ln -s /lib/modules/6.10.3/build/ /usr/src/linux _diskdrivewop="${diskdrive%p}" efibootmgr -c -d /dev/$_diskdrivewop -p ${partition_array[0]} -L "linux" -l '\EFI\BOOT\BOOTX64.EFI' else -- cgit v1.2.3