summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/first_stage.sh10
-rw-r--r--bin/second_stage.sh7
2 files changed, 11 insertions, 6 deletions
diff --git a/bin/first_stage.sh b/bin/first_stage.sh
index 4db34fa..15db09c 100644
--- a/bin/first_stage.sh
+++ b/bin/first_stage.sh
@@ -154,6 +154,11 @@ sleep $DELAY
echo ""
+# Copy repository from live image to root partition
+
+cp -r $REPOSITORY_PATH /mnt$REPOSITORY_PATH
+
+
# Install basic Packages
echo "Going to install basic packages ..."
@@ -176,12 +181,11 @@ echo ""
# Launch second stage in chroot
-echo "bash /opt/archinstall.git/bin/second_stage.sh $hostname ${disk_path}1" | arch-chroot /mnt
+echo "bash $REPOSITORY_PATH/bin/second_stage.sh $hostname ${disk_path}1 $REPOSITORY_PATH" | arch-chroot /mnt
-# Copy files from live image to root partition
+# Copy log from live image to root partition
-cp -r $REPOSITORY_PATH /mnt$REPOSITORY_PATH
cp $LOG_FILE_PATH /mnt$LOG_FILE_PATH
diff --git a/bin/second_stage.sh b/bin/second_stage.sh
index 38b6482..f3353d3 100644
--- a/bin/second_stage.sh
+++ b/bin/second_stage.sh
@@ -27,18 +27,19 @@
hostname=$1
boot_partition_path=$2
+REPOSITORY_PATH=$3
echo "hostname: $hostname"
echo "boot_partition_path: $boot_partition_path"
# Localization
-bash /opt/archinstall.git/bin/localization.sh
+bash $REPOSITORY_PATH/bin/localization.sh
# Network Configuration
-bash /opt/archinstall.git/bin/network_configuration.sh $hostname
+bash $REPOSITORY_PATH/bin/network_configuration.sh $hostname
# Initramfs
@@ -56,4 +57,4 @@ sleep 1
# Bootloader Installation
-bash /opt/archinstall.git/bin/install_bootloader.sh $boot_partition_path
+bash $REPOSITORY_PATH/bin/install_bootloader.sh $boot_partition_path