|
|
@@ -109,8 +109,8 @@ function preChrootStep {
|
|
|
|
|
|
printf "Mount filesystems\n" | tee -a $LOGFILE
|
|
|
mount /dev/VolGroup1/root /mnt
|
|
|
- mkdir -p /mnt/boot
|
|
|
- mount ${BOOTPART} /mnt/boot
|
|
|
+ mkdir -p /mnt/efi
|
|
|
+ mount ${BOOTPART} /mnt/efi
|
|
|
|
|
|
printf "Creating swap file\n" | tee -a $LOGFILE
|
|
|
SWAPSIZE=$(free --giga | grep Mem: | awk '{printf "%dG", $2 * 1.5}')
|
|
|
@@ -171,7 +171,7 @@ function chrootStep {
|
|
|
systemctl enable NetworkManager >&2 || exit $?
|
|
|
systemctl start NetworkManager >&2 || exit $?
|
|
|
|
|
|
- printf "Add decryption kernel options\n" | tee -a $LOGFILE
|
|
|
+ printf "Add decryption kernel options for UKI images\n" | tee -a $LOGFILE
|
|
|
LUKSUUID=$(blkid | grep "${ROOTPART}" | sed -E 's/^.*\bUUID\b="(\S+)".*$/\1/') || exit $?
|
|
|
mkdir -p /etc/cmdline.d >&2 || exit $?
|
|
|
echo "rd.luks.name=${LUKSUUID}=cryptlvm root=/dev/VolGroup1/root rw rootfstype=ext4 rd.shell=0 rd.emergency=reboot" > /etc/cmdline.d/root.conf
|
|
|
@@ -184,7 +184,7 @@ function chrootStep {
|
|
|
printf "Rebuild kernel\n" | tee -a $LOGFILE
|
|
|
mkinitcpio -p linux 2>&1 || exit $?
|
|
|
|
|
|
- printf "Install bootloader (systemd)\n" | tee -a $LOGFILE
|
|
|
+ printf "Install bootloader (systemd-boot)\n" | tee -a $LOGFILE
|
|
|
bootctl install
|
|
|
|
|
|
printf "Exiting chroot\n" | tee -a $LOGFILE
|