From f0b4b9058a1631bf2fb4c3d24a3b9dce04acfc7e Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Tue, 17 Mar 2020 12:13:51 +0100
Subject: Start from Scratch for a Rewrite

---
 archinstall.sh | 67 ++++++++++++++--------------------------------------------
 1 file changed, 16 insertions(+), 51 deletions(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index 2dfbf9e..47afe7c 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -28,20 +28,9 @@
 #################################################################
 
 
-# Settings
+# Stop at any error to optimize debugging:
 
-export TESTSERVER="archlinux.org"  # IP or hostname
-export NETWORK_DEADLINE=1  # in seconds
-export REPOSITORY_URL="https://github.com/xengineering/archinstall/"  # remote
-export REPOSITORY_PATH="/opt/archinstall"  # local
-export BRANCH_OR_COMMIT="master"  # select another branch or commit hash for checkout if needed
-export LOG_FILE_PATH="/var/log/archinstall.log"
-
-
-# PATH expansion
-
-export PATH=$PATH:$REPOSITORY_PATH/stages
-export PATH=$PATH:$REPOSITORY_PATH/util
+set -e
 
 
 # Greetings
@@ -63,45 +52,21 @@ cat << EOF
 EOF
 
 
-# Check internet connection
-
-if ping -w $NETWORK_DEADLINE -c 1 $TESTSERVER; then
-    echo "Internet connection is ready - OK"
-    echo ""
-else
-    echo "Could not reach testserver '$TESTSERVER' - FAILED"
-    exit
-fi
-
-
-# Update the system clock
-
-timedatectl set-ntp true
-if [ $? -eq 0 ]; then
-    echo "Updated system clock - OK"
-    echo ""
-else
-    echo "Could not update system clock - FAILED"
-    exit
-fi
-
-
-# Cloning Git repository
-
-echo "Cloning git repository ..."
-echo ""
-
-pacman --noconfirm -Sy git
-mkdir $REPOSITORY_PATH
-git clone $REPOSITORY_URL $REPOSITORY_PATH
-cd $REPOSITORY_PATH
-git checkout $BRANCH_OR_COMMIT
-cd
+# Constants
 
-echo "Git repository cloned - OK"
-echo ""
+export INTERNET_TEST_SERVER="archlinux.org"
+export INTERNET_TEST_PING_TIMEOUT=1  # seconds
+export FIRST_STAGE_LINK=""
+export SECOND_STAGE_LINK=""
+export PACKAGE_LIST="base linux linux-firmware nano networkmanager"
+export DEFAULT_PASSWORD="archinstall"
 
 
-# Launching first stage
+# Variables
 
-bash first_stage.sh | tee -a $LOG_FILE_PATH
+export boot_mode="unknown"  # alternatives: "bios" or "uefi"
+export luks_encryption="unknown"  # alternatives: "yes" or "no"
+export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
+export locales_to_generate="de_DE.UTF-8 UTF-8;de_DE ISO-8859-1;de_DE@euro ISO-8859-15"
+export keymap="de-latin1"
+export hostname="archlinux"  # will be set to a user-chosen hostname
-- 
cgit v1.2.3-70-g09d2


From 3857365127e27d5b64d5dc36d18fb4f618f9ae70 Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Tue, 17 Mar 2020 13:06:53 +0100
Subject: Enable Download of first_stage.sh

---
 PKGBUILD       | 35 -----------------------------------
 archinstall.sh |  7 +++++++
 2 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 PKGBUILD

(limited to 'archinstall.sh')

diff --git a/PKGBUILD b/PKGBUILD
deleted file mode 100644
index 23a5053..0000000
--- a/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Your Name <youremail@domain.com>
-pkgname=NAME
-pkgver=VERSION
-pkgrel=1
-pkgdesc=""
-arch=()
-url=""
-license=('GPL')
-groups=()
-depends=()
-makedepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=($pkgname-$pkgver.tar.gz)
-noextract=()
-md5sums=() #autofill using updpkgsums
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/archinstall.sh b/archinstall.sh
index 47afe7c..eedb287 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -54,6 +54,7 @@ EOF
 
 # Constants
 
+export BRANCH="master"  # possible alternatives: "devel" or "feature_<myfeature>"
 export INTERNET_TEST_SERVER="archlinux.org"
 export INTERNET_TEST_PING_TIMEOUT=1  # seconds
 export FIRST_STAGE_LINK=""
@@ -70,3 +71,9 @@ export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
 export locales_to_generate="de_DE.UTF-8 UTF-8;de_DE ISO-8859-1;de_DE@euro ISO-8859-15"
 export keymap="de-latin1"
 export hostname="archlinux"  # will be set to a user-chosen hostname
+
+
+# Download and run first stage
+
+curl https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/first_stage.sh > /root/first_stage.sh
+bash /root/first_stage.sh
-- 
cgit v1.2.3-70-g09d2


From 3d4061b6cec978642f2ca9b2de9c6dd9dff5c37b Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Tue, 17 Mar 2020 13:33:26 +0100
Subject: Implement Partitioning

---
 archinstall.sh        | 25 +++++++++++++++----
 stages/first_stage.sh | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 4 deletions(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index eedb287..1fc28fc 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -56,9 +56,9 @@ EOF
 
 export BRANCH="master"  # possible alternatives: "devel" or "feature_<myfeature>"
 export INTERNET_TEST_SERVER="archlinux.org"
-export INTERNET_TEST_PING_TIMEOUT=1  # seconds
-export FIRST_STAGE_LINK=""
-export SECOND_STAGE_LINK=""
+export INTERNET_TEST_PING_TIMEOUT=1  # in seconds
+export FIRST_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/first_stage.sh"
+export SECOND_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/second_stage.sh"
 export PACKAGE_LIST="base linux linux-firmware nano networkmanager"
 export DEFAULT_PASSWORD="archinstall"
 
@@ -66,6 +66,7 @@ export DEFAULT_PASSWORD="archinstall"
 # Variables
 
 export boot_mode="unknown"  # alternatives: "bios" or "uefi"
+export path_to_disk="/dev/null"  # e.g. "/dev/sda"
 export luks_encryption="unknown"  # alternatives: "yes" or "no"
 export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
 export locales_to_generate="de_DE.UTF-8 UTF-8;de_DE ISO-8859-1;de_DE@euro ISO-8859-15"
@@ -73,7 +74,23 @@ export keymap="de-latin1"
 export hostname="archlinux"  # will be set to a user-chosen hostname
 
 
+# Check internet connection
+
+if ping -w $INTERNET_TEST_PING_TIMEOUT -c 1 $INTERNET_TEST_SERVER; then
+    echo "Internet connection is ready - OK"
+    echo ""
+else
+    echo "Could not reach INTERNET_TEST_SERVER '$INTERNET_TEST_SERVER' - FAILED"
+    exit
+fi
+
+
+# Update the system clock
+
+timedatectl set-ntp true
+
+
 # Download and run first stage
 
-curl https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/first_stage.sh > /root/first_stage.sh
+curl $FIRST_STAGE_LINK > /root/first_stage.sh
 bash /root/first_stage.sh
diff --git a/stages/first_stage.sh b/stages/first_stage.sh
index fe5e1bb..8b91c9e 100644
--- a/stages/first_stage.sh
+++ b/stages/first_stage.sh
@@ -24,3 +24,69 @@ set -e
 
 
 echo "Entering first_stage.sh - OK"
+
+
+# Check bootmode
+
+if [ -d "/sys/firmware/efi/efivars" ]; then
+    export boot_mode="uefi"
+    echo "Booted with UEFI"
+else
+    export boot_mode="bios"
+    echo "Booted with legacy boot / BIOS"
+fi
+
+
+# Partition the disk
+
+if [ "$boot_mode" == "unknown" ]; then
+    echo "boot_mode unknown! - FAILED"
+    exit 1
+fi
+
+if [ "$path_to_disk" == "/dev/null" ]; then
+    echo "path_to_disk has still default value! - FAILED"
+    exit 1
+fi
+
+if [ "$boot_mode" == "uefi" ]; then
+    echo "Partitioning for UEFI mode."
+    wipefs -a $path_to_disk  # make sure that fdisk does not ask for removing
+                             # signatures which breaks the script
+    fdisk $path_to_disk << EOF
+g
+n
+1
+
++512M
+n
+2
+
++200M
+n
+3
+
+
+p
+w
+EOF
+
+    echo "Partitioned disk for UEFI/GPT- OK"
+elif [ "$boot_mode" == "bios" ]; then
+    echo "Partitioning for BIOS mode."
+    wipefs -a $path_to_disk  # make sure that fdisk does not ask for removing
+                             # signatures which breaks the script
+    fdisk $path_to_disk << EOF
+o
+n
+p
+1
+
+
+p
+w
+EOF
+
+    echo "Partitioned disk for BIOS/MBR - OK"
+else
+fi
-- 
cgit v1.2.3-70-g09d2


From 4271df687f16c4ba2bd349ac427b04aca7608154 Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Tue, 17 Mar 2020 13:40:03 +0100
Subject: Bugfix

---
 archinstall.sh        | 2 +-
 stages/first_stage.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index 1fc28fc..82f76d1 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -54,7 +54,7 @@ EOF
 
 # Constants
 
-export BRANCH="master"  # possible alternatives: "devel" or "feature_<myfeature>"
+export BRANCH="feature_bios"  # possible alternatives: "devel" or "feature_<myfeature>"
 export INTERNET_TEST_SERVER="archlinux.org"
 export INTERNET_TEST_PING_TIMEOUT=1  # in seconds
 export FIRST_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/first_stage.sh"
diff --git a/stages/first_stage.sh b/stages/first_stage.sh
index 8b91c9e..de850e1 100644
--- a/stages/first_stage.sh
+++ b/stages/first_stage.sh
@@ -89,4 +89,5 @@ EOF
 
     echo "Partitioned disk for BIOS/MBR - OK"
 else
+
 fi
-- 
cgit v1.2.3-70-g09d2


From 33e55cffe600919b295f7a4fb0c621ba3b5db04e Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Tue, 17 Mar 2020 18:18:34 +0100
Subject: Implement if/elif Blocks for Partition Formatting

---
 archinstall.sh        |  2 +-
 stages/first_stage.sh | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index 82f76d1..ddec69c 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -67,7 +67,7 @@ export DEFAULT_PASSWORD="archinstall"
 
 export boot_mode="unknown"  # alternatives: "bios" or "uefi"
 export path_to_disk="/dev/null"  # e.g. "/dev/sda"
-export luks_encryption="unknown"  # alternatives: "yes" or "no"
+export luks_encryption="no"  # alternative: "yes"
 export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
 export locales_to_generate="de_DE.UTF-8 UTF-8;de_DE ISO-8859-1;de_DE@euro ISO-8859-15"
 export keymap="de-latin1"
diff --git a/stages/first_stage.sh b/stages/first_stage.sh
index b8f31dd..dcd2cbd 100644
--- a/stages/first_stage.sh
+++ b/stages/first_stage.sh
@@ -51,6 +51,8 @@ fi
 
 if [ "$boot_mode" == "uefi" ]; then
     echo "Partitioning for UEFI mode."
+    echo "Sorry, this is still untested and you should not try it ..."
+    exit 1
     wipefs -a $path_to_disk  # make sure that fdisk does not ask for removing
                              # signatures which breaks the script
     fdisk $path_to_disk << EOF
@@ -89,3 +91,24 @@ EOF
 
     echo "Partitioned disk for BIOS/MBR - OK"
 fi
+
+
+# Format partitions
+
+if [ "$luks_encryption" == "no" ];then
+    if [ "$boot_mode" == "bios" ];then
+        echo "no/bios"
+    elif [ "$boot_mode" == "uefi" ];then
+        echo "no/uefi"
+    else
+        echo "oh no"
+    fi
+elif [ "$luks_encryption" == "yes" ];then
+    if [ "$boot_mode" == "bios" ];then
+        echo "yes/bios"
+    elif [ "$boot_mode" == "uefi" ];then
+        echo "yes/uefi"
+    else
+        echo "oh no"
+    fi
+fi
-- 
cgit v1.2.3-70-g09d2


From 8c6f99bf7fad289814537e1d915028ebae4a03b3 Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Wed, 18 Mar 2020 10:19:02 +0100
Subject: Implement seperate Boot Partition for BIOS/no LUKS

---
 archinstall.sh        |  6 ++++++
 stages/first_stage.sh | 28 +++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index ddec69c..86c8680 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -94,3 +94,9 @@ timedatectl set-ntp true
 
 curl $FIRST_STAGE_LINK > /root/first_stage.sh
 bash /root/first_stage.sh
+
+
+# Download and run second stage
+
+#curl $SECOND_STAGE_LINK > /mnt/root/second_stage.sh
+#echo "bash /root/second_stage.sh" | arch-chroot /mnt
diff --git a/stages/first_stage.sh b/stages/first_stage.sh
index ad2f6d4..000255c 100644
--- a/stages/first_stage.sh
+++ b/stages/first_stage.sh
@@ -23,6 +23,8 @@
 set -e
 
 
+# Debug output
+
 echo "Entering first_stage.sh - OK"
 
 
@@ -84,12 +86,19 @@ n
 p
 1
 
++200M
+n
+p
+2
+
 
 p
 w
 EOF
 
     echo "Partitioned disk for BIOS/MBR - OK"
+else
+    echo "Unknown boot_mode! - FAILED"
 fi
 
 
@@ -97,9 +106,14 @@ fi
 
 if [ "$luks_encryption" == "no" ];then
     if [ "$boot_mode" == "bios" ];then
+        echo "Formatting for no disk encryption and bios/mbr"
         mkfs.ext4 ${path_to_disk}1
-        e2label ${path_to_disk}1 "ROOT"
+        e2label ${path_to_disk}1 "boot"
+        mkfs.ext4 ${path_to_disk}2
+        e2label ${path_to_disk}2 "root"
     elif [ "$boot_mode" == "uefi" ];then
+        echo "Formatting for no disk encryption and uefi/gpt"
+        ###
         echo "Sorry, UEFI is not ready to use ..."
         exit 1
     else
@@ -107,12 +121,16 @@ if [ "$luks_encryption" == "no" ];then
         exit 1
     fi
 elif [ "$luks_encryption" == "yes" ];then
-    echo "Sorry, LUKS encryption is not ready to use ..."
-    exit 1
     if [ "$boot_mode" == "bios" ];then
-        echo "yes/bios"
+        echo "Formatting for disk encryption and bios/mbr"
+        ###
+        echo "Sorry, encryption is not ready to use ..."
+        exit 1
     elif [ "$boot_mode" == "uefi" ];then
-        echo "yes/uefi"
+        echo "Formatting for disk encryption and uefi/gpt"
+        ###
+        echo "Sorry, encryption is not ready to use ..."
+        exit 1
     else
         echo "Unknown boot_mode! - FAILED"
         exit 1
-- 
cgit v1.2.3-70-g09d2


From 27dd408ef896e1d76e8d9b1ead2d19dd239b46ae Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Wed, 18 Mar 2020 13:45:05 +0100
Subject: Make Test Setup for chroot

---
 archinstall.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index 86c8680..dbff991 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -54,6 +54,7 @@ EOF
 
 # Constants
 
+  ######################## CHANGE FOR PRODUCTION:
 export BRANCH="feature_bios"  # possible alternatives: "devel" or "feature_<myfeature>"
 export INTERNET_TEST_SERVER="archlinux.org"
 export INTERNET_TEST_PING_TIMEOUT=1  # in seconds
@@ -66,7 +67,7 @@ export DEFAULT_PASSWORD="archinstall"
 # Variables
 
 export boot_mode="unknown"  # alternatives: "bios" or "uefi"
-export path_to_disk="/dev/null"  # e.g. "/dev/sda"
+export path_to_disk="/dev/sda"  # e.g. "/dev/sda"  ######################## REMOVE FOR PRODUCTION
 export luks_encryption="no"  # alternative: "yes"
 export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
 export locales_to_generate="de_DE.UTF-8 UTF-8;de_DE ISO-8859-1;de_DE@euro ISO-8859-15"
@@ -92,11 +93,11 @@ timedatectl set-ntp true
 
 # Download and run first stage
 
-curl $FIRST_STAGE_LINK > /root/first_stage.sh
-bash /root/first_stage.sh
+#curl $FIRST_STAGE_LINK > /root/first_stage.sh
+#bash /root/first_stage.sh
 
 
 # Download and run second stage
 
-#curl $SECOND_STAGE_LINK > /mnt/root/second_stage.sh
-#echo "bash /root/second_stage.sh" | arch-chroot /mnt
+curl $SECOND_STAGE_LINK > /mnt/root/second_stage.sh
+echo "bash /root/second_stage.sh" | arch-chroot /mnt
-- 
cgit v1.2.3-70-g09d2


From 9a3fb771fbce4b9ace6ee4bebdd60c9985210dff Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Wed, 18 Mar 2020 14:02:16 +0100
Subject: Implement Timezone and Localization

---
 archinstall.sh         |  3 ++-
 stages/second_stage.sh | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index dbff991..6f02551 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -70,7 +70,8 @@ export boot_mode="unknown"  # alternatives: "bios" or "uefi"
 export path_to_disk="/dev/sda"  # e.g. "/dev/sda"  ######################## REMOVE FOR PRODUCTION
 export luks_encryption="no"  # alternative: "yes"
 export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
-export locales_to_generate="de_DE.UTF-8 UTF-8;de_DE ISO-8859-1;de_DE@euro ISO-8859-15"
+export locales_to_generate="de_DE.UTF-8 UTF-8\nde_DE ISO-8859-1\nde_DE@euro ISO-8859-15\n"
+export language="de_DE.UTF-8"
 export keymap="de-latin1"
 export hostname="archlinux"  # will be set to a user-chosen hostname
 
diff --git a/stages/second_stage.sh b/stages/second_stage.sh
index abb8ed9..3070e50 100644
--- a/stages/second_stage.sh
+++ b/stages/second_stage.sh
@@ -23,4 +23,22 @@
 set -e
 
 
+# Debug output
+
 echo "Entering second_stage.sh - OK"
+
+
+# Set timezone
+
+ln -sf $path_to_timezone /etc/localtime
+hwclock --systohc
+
+
+# Localization
+
+echo "$locales_to_generate" >> /etc/locale.gen
+locale-gen
+touch /etc/locale.conf
+echo "LANG=$language" >> /etc/locale.conf
+touch /etc/vconsole.conf
+echo "KEYMAP=$keymap" >> /etc/vconsole.conf
-- 
cgit v1.2.3-70-g09d2


From b3f36598ba1cfba147824dca69e793c29e3b13eb Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Wed, 18 Mar 2020 17:16:54 +0100
Subject: Implement Network Config and Root Password

---
 archinstall.sh         |  2 +-
 stages/second_stage.sh | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index 6f02551..40f6575 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -70,7 +70,7 @@ export boot_mode="unknown"  # alternatives: "bios" or "uefi"
 export path_to_disk="/dev/sda"  # e.g. "/dev/sda"  ######################## REMOVE FOR PRODUCTION
 export luks_encryption="no"  # alternative: "yes"
 export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
-export locales_to_generate="de_DE.UTF-8 UTF-8\nde_DE ISO-8859-1\nde_DE@euro ISO-8859-15\n"
+export locales_to_generate="de_DE.UTF-8 UTF-8"  # currently just one option
 export language="de_DE.UTF-8"
 export keymap="de-latin1"
 export hostname="archlinux"  # will be set to a user-chosen hostname
diff --git a/stages/second_stage.sh b/stages/second_stage.sh
index 3070e50..1530a7d 100644
--- a/stages/second_stage.sh
+++ b/stages/second_stage.sh
@@ -42,3 +42,22 @@ touch /etc/locale.conf
 echo "LANG=$language" >> /etc/locale.conf
 touch /etc/vconsole.conf
 echo "KEYMAP=$keymap" >> /etc/vconsole.conf
+
+
+# Network configuration
+
+touch /etc/hostname
+echo "$hostname" > /etc/hostname
+touch /etc/hosts
+echo "127.0.0.1    localhost" >> /etc/hosts
+echo "::1       localhost" >> /etc/hosts
+
+
+# Initramfs
+
+### to be implemented
+
+
+# Setting root password
+
+echo "root:${DEFAULT_PASSWORD}" | chpasswd
-- 
cgit v1.2.3-70-g09d2


From cc1553589ece2030e1d00cc75bb0ed16ff00cda8 Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Wed, 18 Mar 2020 17:35:37 +0100
Subject: Implement full Test Setup

---
 archinstall.sh         | 6 +++---
 stages/second_stage.sh | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index 40f6575..c1daaf9 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -67,7 +67,7 @@ export DEFAULT_PASSWORD="archinstall"
 # Variables
 
 export boot_mode="unknown"  # alternatives: "bios" or "uefi"
-export path_to_disk="/dev/sda"  # e.g. "/dev/sda"  ######################## REMOVE FOR PRODUCTION
+export path_to_disk="/dev/null"  # e.g. "/dev/sda"
 export luks_encryption="no"  # alternative: "yes"
 export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"
 export locales_to_generate="de_DE.UTF-8 UTF-8"  # currently just one option
@@ -94,8 +94,8 @@ timedatectl set-ntp true
 
 # Download and run first stage
 
-#curl $FIRST_STAGE_LINK > /root/first_stage.sh
-#bash /root/first_stage.sh
+curl $FIRST_STAGE_LINK > /root/first_stage.sh
+bash /root/first_stage.sh
 
 
 # Download and run second stage
diff --git a/stages/second_stage.sh b/stages/second_stage.sh
index ea623a7..be55b29 100644
--- a/stages/second_stage.sh
+++ b/stages/second_stage.sh
@@ -66,4 +66,5 @@ echo "root:${DEFAULT_PASSWORD}" | chpasswd
 # Install bootloader
 
 grub-install --target=i386-pc $path_to_disk
+mkdir /boot/grub
 grub-mkconfig -o /boot/grub/grub.cfg
-- 
cgit v1.2.3-70-g09d2


From ebf7eac32d7ce0f176e269d6647ed1914cdeaff9 Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Wed, 18 Mar 2020 18:04:29 +0100
Subject: Ready for devel branch

---
 archinstall.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index c1daaf9..43f9d8f 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -55,7 +55,7 @@ EOF
 # Constants
 
   ######################## CHANGE FOR PRODUCTION:
-export BRANCH="feature_bios"  # possible alternatives: "devel" or "feature_<myfeature>"
+export BRANCH="devel"  # possible alternatives: "devel" or "feature_<myfeature>"
 export INTERNET_TEST_SERVER="archlinux.org"
 export INTERNET_TEST_PING_TIMEOUT=1  # in seconds
 export FIRST_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/first_stage.sh"
@@ -98,7 +98,8 @@ curl $FIRST_STAGE_LINK > /root/first_stage.sh
 bash /root/first_stage.sh
 
 
-# Download and run second stage
+# Download, run and delete second stage
 
 curl $SECOND_STAGE_LINK > /mnt/root/second_stage.sh
 echo "bash /root/second_stage.sh" | arch-chroot /mnt
+rm /mnt/root/second_stage.sh
-- 
cgit v1.2.3-70-g09d2