diff options
Diffstat (limited to 'stages')
| -rw-r--r-- | stages/first_stage.sh | 13 | ||||
| -rw-r--r-- | stages/second_stage.sh | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/stages/first_stage.sh b/stages/first_stage.sh index 037d554..cdf661e 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -38,9 +38,6 @@ python -u $REPOSITORY_PATH/util/write_config.py $CONFIG_FILE_PATH export disk=$(python -u $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "disk") export disk_path=/dev/$disk -export efi_partition_path="${disk_path}1" -export boot_partition_path="${disk_path}2" -export main_partition_path="${disk_path}3" export hostname=$(python -u $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "hostname") export desktop=$(python -u $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "desktop") export admin_username=$(python -u $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "admin_username") @@ -52,17 +49,21 @@ bash confirm_installation.sh $disk if [ "$(bash check_bootmode.sh)" == "Booted with UEFI" ];then echo "Booted with UEFI - OK" export boot_mode="UEFI" + export efi_partition_path="${disk_path}1" + export boot_partition_path="${disk_path}2" + export main_partition_path="${disk_path}3" elif [ "$(bash check_bootmode.sh)" == "Booted with legacy boot / BIOS" ];then echo "Booted with BIOS - OK" export boot_mode="BIOS" + export efi_partition_path="/dev/null" + export boot_partition_path="/dev/null" + export main_partition_path="${disk_path}1" else echo "Unknown boot mode - FAILED" exit fi -exit - -bash partition_disk.sh $disk_path +bash partition_disk.sh $disk_path $boot_mode if [ $system_encryption == "yes" ];then bash format_crypto_partition.sh $main_partition_path $DEFAULT_PASSWORD diff --git a/stages/second_stage.sh b/stages/second_stage.sh index c2c0b92..30dc495 100644 --- a/stages/second_stage.sh +++ b/stages/second_stage.sh @@ -33,6 +33,6 @@ bash configure_initramfs.sh bash configure_users.sh $admin_username $DEFAULT_PASSWORD -bash install_bootloader.sh $efi_partition_path $system_encryption $main_partition_path +bash install_bootloader.sh $efi_partition_path $system_encryption $main_partition_path $boot_mode bash configure_desktop.sh |