diff options
-rw-r--r-- | stages/first_stage.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/stages/first_stage.sh b/stages/first_stage.sh index 03cbb43..037d554 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -31,22 +31,24 @@ export DEFAULT_PASSWORD="archinstall" mkdir $(dirname "$CONFIG_FILE_PATH") touch $CONFIG_FILE_PATH -python $REPOSITORY_PATH/util/write_config.py $CONFIG_FILE_PATH +python -u $REPOSITORY_PATH/util/write_config.py $CONFIG_FILE_PATH # Reading config values to bash -export disk=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "disk") +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 $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "hostname") -export desktop=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "desktop") -export admin_username=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "admin_username") -export system_encryption=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "system_encryption") +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") +export system_encryption=$(python -u $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "system_encryption") +bash confirm_installation.sh $disk + if [ "$(bash check_bootmode.sh)" == "Booted with UEFI" ];then echo "Booted with UEFI - OK" export boot_mode="UEFI" @@ -60,10 +62,6 @@ fi exit -bash confirm_installation.sh $disk - -bash check_bootmode.sh - bash partition_disk.sh $disk_path if [ $system_encryption == "yes" ];then |