diff options
author | xengineering <mail2xengineering@protonmail.com> | 2020-03-18 10:19:02 +0100 |
---|---|---|
committer | xengineering <mail2xengineering@protonmail.com> | 2020-03-18 10:19:02 +0100 |
commit | 8c6f99bf7fad289814537e1d915028ebae4a03b3 (patch) | |
tree | 685f9f800796597646503eacd1cdc7f3e8b739b9 | |
parent | fd30949efaea3d564f2a954a585d93264d671760 (diff) | |
download | archinstall-8c6f99bf7fad289814537e1d915028ebae4a03b3.tar archinstall-8c6f99bf7fad289814537e1d915028ebae4a03b3.tar.zst archinstall-8c6f99bf7fad289814537e1d915028ebae4a03b3.zip |
Implement seperate Boot Partition for BIOS/no LUKS
-rw-r--r-- | archinstall.sh | 6 | ||||
-rw-r--r-- | stages/first_stage.sh | 28 |
2 files changed, 29 insertions, 5 deletions
diff --git a/archinstall.sh b/archinstall.sh index ddec69c..86c8680 100644 --- a/archinstall.sh +++ b/archinstall.sh @@ -94,3 +94,9 @@ timedatectl set-ntp true curl $FIRST_STAGE_LINK > /root/first_stage.sh bash /root/first_stage.sh + + +# Download and run second stage + +#curl $SECOND_STAGE_LINK > /mnt/root/second_stage.sh +#echo "bash /root/second_stage.sh" | arch-chroot /mnt diff --git a/stages/first_stage.sh b/stages/first_stage.sh index ad2f6d4..000255c 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -23,6 +23,8 @@ set -e +# Debug output + echo "Entering first_stage.sh - OK" @@ -84,12 +86,19 @@ n p 1 ++200M +n +p +2 + p w EOF echo "Partitioned disk for BIOS/MBR - OK" +else + echo "Unknown boot_mode! - FAILED" fi @@ -97,9 +106,14 @@ fi if [ "$luks_encryption" == "no" ];then if [ "$boot_mode" == "bios" ];then + echo "Formatting for no disk encryption and bios/mbr" mkfs.ext4 ${path_to_disk}1 - e2label ${path_to_disk}1 "ROOT" + e2label ${path_to_disk}1 "boot" + mkfs.ext4 ${path_to_disk}2 + e2label ${path_to_disk}2 "root" elif [ "$boot_mode" == "uefi" ];then + echo "Formatting for no disk encryption and uefi/gpt" + ### echo "Sorry, UEFI is not ready to use ..." exit 1 else @@ -107,12 +121,16 @@ if [ "$luks_encryption" == "no" ];then exit 1 fi elif [ "$luks_encryption" == "yes" ];then - echo "Sorry, LUKS encryption is not ready to use ..." - exit 1 if [ "$boot_mode" == "bios" ];then - echo "yes/bios" + echo "Formatting for disk encryption and bios/mbr" + ### + echo "Sorry, encryption is not ready to use ..." + exit 1 elif [ "$boot_mode" == "uefi" ];then - echo "yes/uefi" + echo "Formatting for disk encryption and uefi/gpt" + ### + echo "Sorry, encryption is not ready to use ..." + exit 1 else echo "Unknown boot_mode! - FAILED" exit 1 |