Ver Fonte

remove a mkinitcpio -P cmd + revert back to linux pkg + test out chroot.sh error_exit

Noah Vogt há 1 ano atrás
pai
commit
44b00f4edc
2 ficheiros alterados com 7 adições e 5 exclusões
  1. 6 4
      chroot.sh
  2. 1 1
      stage1.sh

+ 6 - 4
chroot.sh

@@ -26,12 +26,11 @@ mkdir -p /efi/EFI/Linux
 test -d /efi/EFI || error_exit "Error: EFI partition could not be mounted correctly."
 
 sed -i 's/block filesystems/block encrypt filesystems/' /etc/mkinitcpio.conf
-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 "pti=on page_alloc.shuffle=1 BOOT_IMAGE=/boot/vmlinuz-linux-hardened root=UUID=$root_uuid rw cryptdevice=UUID=$drive2_uuid:cryptroot loglevel=0 quiet udev.log_level=3" > /etc/kernel/cmdline
+echo "pti=on page_alloc.shuffle=1 BOOT_IMAGE=/boot/vmlinuz-linux root=UUID=$root_uuid rw cryptdevice=UUID=$drive2_uuid:cryptroot loglevel=0 quiet udev.log_level=3" > /etc/kernel/cmdline
 chmod +w /etc/kernel/cmdline
 
 sb_status="$(sbctl status)"
@@ -41,8 +40,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
 
@@ -58,4 +57,7 @@ efibootmgr --create \
 
 mkinitcpio -P
 
+sbctl ls
+error_exit "Error: Test Error."
+
 rm drive

+ 1 - 1
stage1.sh

@@ -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