소스 검색

try to fix hardened kernel + switch to raw gh execution

Noah Vogt 1 년 전
부모
커밋
f394695f50
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      chroot.sh
  2. 4 2
      stage1.sh

+ 1 - 1
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=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-hardened 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)"

+ 4 - 2
stage1.sh

@@ -63,7 +63,9 @@ mv drive /mnt
 mv videopc_api_key videopc_rtmp_key /mnt/etc
 echo "videopc" > /mnt/etc/hostname
 
-cp chroot.sh stage2.sh /mnt
-arch-chroot /mnt bash chroot.sh || exit 1
+curl -LO https://raw.githubusercontent.com/noahvogt/videopc-infra/master/chroot.sh --output-dir /mnt
+curl -LO https://raw.githubusercontent.com/noahvogt/videopc-infra/master/stage2.sh --output-dir /mnt || error_exit "Error: Failed to install stage2 script."
+arch-chroot /mnt bash chroot.sh || error_exit "Error: Installation failed."
+rm /mnt/chroot.sh
 
 systemctl reboot --firmware