From b5e454658004691d9cc9c9f7d1dd366c6c6c5444 Mon Sep 17 00:00:00 2001 From: xengineering Date: Sun, 15 Dec 2019 13:10:04 +0100 Subject: Finally moved to new stages/util system. --- stages/first_stage.sh | 6 +++--- stages/second_stage.sh | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'stages') diff --git a/stages/first_stage.sh b/stages/first_stage.sh index 036443b..a748db1 100644 --- a/stages/first_stage.sh +++ b/stages/first_stage.sh @@ -30,12 +30,12 @@ python $REPOSITORY_PATH/util/write_config.py $CONFIG_FILE_PATH # Reading config values to bash -export disk=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "disk") +export disk=$(python $REPOSITORY_PATH/util/read_config_string.py $CONFIG_FILE_PATH "disk") export disk_path=/dev/$disk export boot_partition_path="${disk_path}1" export root_partition_path="${disk_path}2" -export hostname=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "hostname") -export desktop=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "desktop") +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") # Confirmation diff --git a/stages/second_stage.sh b/stages/second_stage.sh index 4cae372..f4b867e 100644 --- a/stages/second_stage.sh +++ b/stages/second_stage.sh @@ -21,12 +21,6 @@ echo "Entering second_stage.sh - OK" -echo "Debug values:" -echo $PATH -echo $REPOSITORY_PATH -echo "End of debug" - - bash configure_keyboard.sh de-latin1 bash configure_locales.sh -- cgit v1.2.3-70-g09d2