summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archinstall.sh33
-rw-r--r--bin/second_stage.sh2
2 files changed, 30 insertions, 5 deletions
diff --git a/archinstall.sh b/archinstall.sh
index 80eb5b7..5f8b9d6 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -210,9 +210,32 @@ sleep $DELAY
echo ""
-# Install git in new environment and clone archinstall repository
+# Install git in live environment and clone archinstall repository
+
+pacman --noconfirm -Syu git
+cd /mnt/opt && git clone https://github.com/xengineering/archinstall
+cd /root
+mv /mnt/opt/archinstall /mnt/opt/archinstall.git
+cd /mnt/opt/archinstall.git && git checkout $BRANCH
+cd /root
+echo "bash /opt/archinstall/bin/second_stage.sh $hostname ${$disk_path}1" | arch-chroot /mnt
+
+cd /root && umount $root_partition_path
+echo "Removed second stage script and unmounted root partition - OK"
+sleep $DELAY
+echo ""
+
-echo "pacman --noconfirm -Syu git" | arch-chroot /mnt
-echo "cd /opt && git clone https://github.com/xengineering/archinstall" | arch-chroot /mnt
-echo "cd /opt/archinstall && git checkout feature_01" | arch-chroot /mnt # JUST FOR DEBUGGING!!!
-echo "bash /opt/archinstall/bin/test.sh" | arch-chroot /mnt
+# Final Messages
+
+cat << EOF
+#################################################################
+# #
+# The default login is user root with password 'root'. #
+# You can now power off your machine with 'poweroff', #
+# remove the installation media and boot your new #
+# Arch Linux machine! #
+# #
+#################################################################
+
+EOF
diff --git a/bin/second_stage.sh b/bin/second_stage.sh
index 91f5ba8..5099e20 100644
--- a/bin/second_stage.sh
+++ b/bin/second_stage.sh
@@ -23,6 +23,8 @@
hostname=$1
boot_partition_path=$2
+echo "hostname: $hostname"
+echo "boot_partition_path: $boot_partition_path"
# Localization