summaryrefslogtreecommitdiff
path: root/stages
diff options
context:
space:
mode:
authorxengineering <mail2xengineering@protonmail.com>2019-12-15 13:10:04 +0100
committerxengineering <mail2xengineering@protonmail.com>2019-12-15 13:10:04 +0100
commitb5e454658004691d9cc9c9f7d1dd366c6c6c5444 (patch)
tree26eac993715eef9b04d91f45c20a1558d471e6df /stages
parent5259030286c8f65892d3210098661778a5152956 (diff)
downloadarchinstall-b5e454658004691d9cc9c9f7d1dd366c6c6c5444.tar
archinstall-b5e454658004691d9cc9c9f7d1dd366c6c6c5444.tar.zst
archinstall-b5e454658004691d9cc9c9f7d1dd366c6c6c5444.zip
Finally moved to new stages/util system.
Diffstat (limited to 'stages')
-rw-r--r--stages/first_stage.sh6
-rw-r--r--stages/second_stage.sh6
2 files changed, 3 insertions, 9 deletions
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