Переглянути джерело

use more verbose lsblk ouput + pix a mkinitcpio cmd + revert some /dev/sda2 hardcoding + revert to linux kernel pkg

Noah Vogt 1 рік тому
батько
коміт
6ae0580b42
2 змінених файлів з 7 додано та 7 видалено
  1. 4 4
      chroot.sh
  2. 3 3
      stage1.sh

+ 4 - 4
chroot.sh

@@ -31,7 +31,7 @@ mkinitcpio -P
 root_uuid="$(grep ext4 /etc/fstab | sed 's/^UUID=//; s/\s\/.*$//')"
 drive2_uuid="$(blkid | grep "$DRIVE"2 | tr ' ' '\n' | grep ^UUID= | sed 's/^UUID="//; s/"//')"
 
-echo "BOOT_IMAGE=/boot/vmlinuz-linux-hardened root=UUID=$root_uuid rw cryptdevice=$drive2_uuid:cryptroot loglevel=0 quiet udev.log_level=3" > /etc/kernel/cmdline
+echo "BOOT_IMAGE=/boot/vmlinuz-linux root=UUID=$root_uuid rw cryptdevice=$/dev/sda2:cryptroot loglevel=0 quiet udev.log_level=3" > /etc/kernel/cmdline
 chmod +w /etc/kernel/cmdline
 
 sb_status="$(sbctl status)"
@@ -41,8 +41,8 @@ echo "$sb_status" | grep "^Vendor Keys:" | grep -q "none" || error_exit "Error:
 
 sbctl bundle -s \
     -a /boot/amd-ucode.img \
-    -k /boot/vmlinuz-linux-hardened \
-    -f /boot/initramfs-linux-hardened.img \
+    -k /boot/vmlinuz-linux\
+    -f /boot/initramfs-linux.img \
     -c /etc/kernel/cmdline \
     /efi/EFI/Linux/ArchBundle.efi
 
@@ -56,6 +56,6 @@ efibootmgr --create \
     --label "videopc signed efi bundle" \
     --loader /EFI/Linux/ArchBundle.efi
 
-mkinitcpio -p linux
+mkinitcpio -P
 
 rm drive

+ 3 - 3
stage1.sh

@@ -8,8 +8,8 @@ error_exit() {
 pacman -Sy --noconfirm dialog || error_exit "Error at script start:\n\nAre you sure you're running this as the root user?\n\t(Tip: run 'whoami' to check)\n\nAre you sure you have an internet connection?\n\t(Tip: run 'ip a' to check)\n"
 
 clear
-lsblk -d | sed 's/0 disk/0 disk\\n/;s/POINT/POINT\\n/'
-read -rp "Press any key to continue"
+lsblk
+read -rp "After deciding which drive to install the system on, press any key to continue"
 
 dialog --no-cancel --inputbox "Enter the drive you want do install Arch Linux for the VIDEOPC on." 10 60 2>drive
 
@@ -56,7 +56,7 @@ mount /dev/"$DRIVE"1 /mnt/efi
 
 pacman -Sy --noconfirm archlinux-keyring
 
-pacstrap /mnt base linux-hardened linux-firmware networkmanager sbctl amd-ucode efibootmgr tpm2-tss
+pacstrap /mnt base linux linux-firmware networkmanager sbctl amd-ucode efibootmgr tpm2-tss
 
 genfstab -U /mnt >> /mnt/etc/fstab
 mv drive /mnt