diff --git a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh index 680646b..2d618bc 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh +++ b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh @@ -14,10 +14,7 @@ mount -t sysfs sys "$1/sys" -o nosuid,nodev,noexec,ro echo 'ARCH_COPY' | nc -U $SOCKET_PATH || true mkdir -p "$1"/var/cache/apt/archives cp -rvf /cdrom/pool/main/* "$1"/var/cache/apt/archives/ -# Run Chroot Commands -mkdir -pv "$1"/usr/lib/pika/pikainstall/ -cp -rvf /usr/lib/pika/pikainstall/pika-install-chroot.sh "$1"/usr/lib/pika/pikainstall/ -chroot "$1" /bin/bash -c "/usr/lib/pika/pikainstall/pika-install-chroot.sh" + # Setup Disk Encryption if [ -f /var/albius-crypttab-manual.sh ] then @@ -45,6 +42,11 @@ refind-install --usedefault "$(/usr/lib/pika/pikainstall/partition-helper.sh par mkdir -pv "$1"/boot/efi/EFI/BOOT/drivers_x64 cp -vf /usr/share/refind/refind/drivers_x64/ext4_x64.efi "$1"/boot/efi/EFI/BOOT/drivers_x64/ +# Run Chroot Commands +mkdir -pv "$1"/usr/lib/pika/pikainstall/ +cp -rvf /usr/lib/pika/pikainstall/pika-install-chroot.sh "$1"/usr/lib/pika/pikainstall/ +chroot "$1" /bin/bash -c "/usr/lib/pika/pikainstall/pika-install-chroot.sh" + echo 'UNBIND' | nc -U $SOCKET_PATH || true # Unmount host partitions from chroot umount "$1/media/cdrom" || umount -lf "$1/media/cdrom" || true