From deec260fdacce82717cee7b48be0db2d027c1568 Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Mon, 25 Nov 2019 13:45:11 +0100
Subject: Bugfix according to not installed python package.

---
 bin/first_stage.sh  | 3 ++-
 bin/second_stage.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin')

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
-- 
cgit v1.2.3-70-g09d2