diff options
| author | xengineering <mail2xengineering@protonmail.com> | 2020-01-12 16:42:06 +0100 |
|---|---|---|
| committer | xengineering <mail2xengineering@protonmail.com> | 2020-01-12 16:42:06 +0100 |
| commit | 4d386c57aa1a002bd3d45d1871de8517bd6673e6 (patch) | |
| tree | 63852db423df5c637c6ee62f95c42dcd15761885 | |
| parent | 19dd3e315bc713f8ad313bf063a1016a903e0df4 (diff) | |
| download | archinstall-4d386c57aa1a002bd3d45d1871de8517bd6673e6.tar archinstall-4d386c57aa1a002bd3d45d1871de8517bd6673e6.tar.zst archinstall-4d386c57aa1a002bd3d45d1871de8517bd6673e6.zip | |
Another test for check_bootmode.sh.
| -rw-r--r-- | stages/first_stage.sh | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/stages/first_stage.sh b/stages/first_stage.sh index acb58f0..03cbb43 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -48,13 +48,14 @@ export system_encryption=$(python $REPOSITORY_PATH/util/read_config_string.py $C if [ "$(bash check_bootmode.sh)" == "Booted with UEFI" ];then - echo "Booted with UEFI - OK" - -else - + export boot_mode="UEFI" +elif [ "$(bash check_bootmode.sh)" == "Booted with legacy boot / BIOS" ];then echo "Booted with BIOS - OK" - + export boot_mode="BIOS" +else + echo "Unknown boot mode - FAILED" + exit fi exit @@ -66,15 +67,11 @@ bash check_bootmode.sh bash partition_disk.sh $disk_path if [ $system_encryption == "yes" ];then - bash format_crypto_partition.sh $main_partition_path $DEFAULT_PASSWORD bash open_crypto_partition.sh $main_partition_path $DEFAULT_PASSWORD export root_partition_path="/dev/mapper/main" - else - export root_partition_path=$main_partition_path - fi bash create_filesystems.sh $efi_partition_path $boot_partition_path $root_partition_path @@ -94,9 +91,7 @@ bash copy_archinstall_log.sh $LOG_FILE_PATH bash unmount_filesystems.sh $boot_partition_path $root_partition_path if [ $system_encryption == "yes" ];then - bash close_crypto_partition.sh $main_partition_path - fi bash print_final_message.sh $DEFAULT_PASSWORD |