diff options
| author | xengineering <mail2xengineering@protonmail.com> | 2019-11-25 13:45:11 +0100 |
|---|---|---|
| committer | xengineering <mail2xengineering@protonmail.com> | 2019-11-25 13:45:11 +0100 |
| commit | deec260fdacce82717cee7b48be0db2d027c1568 (patch) | |
| tree | bed4ff04f54c775ce64bdf577adb752ef998c31b /bin | |
| parent | d45d41ee0bd52b28226e69317bca1c284009b397 (diff) | |
| download | archinstall-deec260fdacce82717cee7b48be0db2d027c1568.tar archinstall-deec260fdacce82717cee7b48be0db2d027c1568.tar.zst archinstall-deec260fdacce82717cee7b48be0db2d027c1568.zip | |
Bugfix according to not installed python package.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/first_stage.sh | 3 | ||||
| -rw-r--r-- | bin/second_stage.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/first_stage.sh b/bin/first_stage.sh index 5981cd9..629c750 100644 --- a/bin/first_stage.sh +++ b/bin/first_stage.sh @@ -37,6 +37,7 @@ python $2/bin/write_config.py $CONFIG_FILE_PATH disk=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "disk") disk_path=/dev/$disk hostname=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "hostname") +desktop=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "desktop") echo "All data on disk '$disk' will be finally lost!" @@ -137,7 +138,7 @@ echo "" # Launch second stage in chroot echo "bash $REPOSITORY_PATH/bin/second_stage.sh $hostname \ -${disk_path}1 $REPOSITORY_PATH $CONFIG_FILE_PATH" | arch-chroot /mnt +${disk_path}1 $REPOSITORY_PATH $CONFIG_FILE_PATH $desktop" | arch-chroot /mnt # Copy log and config from live image to root partition diff --git a/bin/second_stage.sh b/bin/second_stage.sh index cd9abf9..01739ba 100644 --- a/bin/second_stage.sh +++ b/bin/second_stage.sh @@ -29,6 +29,7 @@ hostname=$1 boot_partition_path=$2 REPOSITORY_PATH=$3 CONFIG_FILE_PATH=$4 +desktop=$5 # Localization @@ -61,7 +62,6 @@ bash $REPOSITORY_PATH/bin/install_bootloader.sh $boot_partition_path # Desktop Installation -desktop=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "desktop") if [ "$desktop" = "yes" ]; then bash $REPOSITORY_PATH/bin/install_desktop.sh fi |