summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxengineering <mail2xengineering@protonmail.com>2019-09-23 21:25:25 +0200
committerxengineering <mail2xengineering@protonmail.com>2019-09-23 21:25:25 +0200
commit45ecf79c4198fcb8399b36bf695b535d35854cca (patch)
treeed1e29749ecbca9dc94ef8776b0cce5f3f4d75a9
parent1c2a083eda484a53660d5f1394e7a4eed77389e8 (diff)
downloadarchinstall-45ecf79c4198fcb8399b36bf695b535d35854cca.tar
archinstall-45ecf79c4198fcb8399b36bf695b535d35854cca.tar.zst
archinstall-45ecf79c4198fcb8399b36bf695b535d35854cca.zip
Some small changes.
-rw-r--r--archinstall.sh8
-rw-r--r--bin/install_bootloader.sh6
-rw-r--r--bin/localization.sh6
-rw-r--r--bin/network_configuration.sh6
-rw-r--r--bin/second_stage.sh7
-rw-r--r--devel_server.py6
6 files changed, 31 insertions, 8 deletions
diff --git a/archinstall.sh b/archinstall.sh
index 8464465..c9f1b77 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -19,7 +19,7 @@
#################################################################
-# #
+# _ _ _ _ _ #
# __ _ _ __ ___| |__ (_)_ __ ___| |_ __ _| | | ___| |__ #
# / _` | '__/ __| '_ \| | '_ \/ __| __/ _` | | | / __| '_ \ #
# | (_| | | | (__| | | | | | | \__ \ || (_| | | |_\__ \ | | | #
@@ -31,8 +31,8 @@
# Settings for the Script:
DELAY=0.5
-BRANCH="master"
-BASE_URL="https://github.com/xengineering/archinstall"
+CLONE_BRANCH="master"
+BASE_URL="https://github.com/xengineering/archinstall/"
RAW_BASE_URL="https://raw.githubusercontent.com/xengineering/archinstall/"
@@ -217,7 +217,7 @@ pacman --noconfirm -Sy git
cd /mnt/opt && git clone $BASE_URL
cd /root
mv /mnt/opt/archinstall /mnt/opt/archinstall.git
-cd /mnt/opt/archinstall.git && git checkout $BRANCH
+cd /mnt/opt/archinstall.git && git checkout $CLONE_BRANCH
cd /root
echo "bash /opt/archinstall.git/bin/second_stage.sh $hostname ${disk_path}1" | arch-chroot /mnt
diff --git a/bin/install_bootloader.sh b/bin/install_bootloader.sh
index ccb2173..2f19ca3 100644
--- a/bin/install_bootloader.sh
+++ b/bin/install_bootloader.sh
@@ -18,6 +18,11 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
+###########################
+# install_bootloader.sh #
+###########################
+
+
# Install Grub
pacman --noconfirm -Syu grub efibootmgr
@@ -32,4 +37,3 @@ sleep 1
echo "Leaving chroot environment - OK"
echo ""
sleep 1
-
diff --git a/bin/localization.sh b/bin/localization.sh
index 52ab0d0..44ffa81 100644
--- a/bin/localization.sh
+++ b/bin/localization.sh
@@ -18,6 +18,11 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#####################
+# localization.sh #
+#####################
+
+
# Set timezone
ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
@@ -47,4 +52,3 @@ echo "KEYMAP=de-latin1" > /etc/vconsole.conf
echo "German localization done - OK"
echo ""
sleep 1
-
diff --git a/bin/network_configuration.sh b/bin/network_configuration.sh
index 23368b2..8eb73f6 100644
--- a/bin/network_configuration.sh
+++ b/bin/network_configuration.sh
@@ -18,6 +18,11 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
+##############################
+# network_configuration.sh #
+##############################
+
+
# Network Configuration
touch /etc/hostname
@@ -31,4 +36,3 @@ echo "::1 localhost" >> /etc/hosts
echo "Network configuration done - OK"
echo ""
sleep 1
-
diff --git a/bin/second_stage.sh b/bin/second_stage.sh
index 5099e20..38b6482 100644
--- a/bin/second_stage.sh
+++ b/bin/second_stage.sh
@@ -18,9 +18,13 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
-# Second Stage of archinstall
+#####################
+# second_stage.sh #
+#####################
+# Argument Processing
+
hostname=$1
boot_partition_path=$2
echo "hostname: $hostname"
@@ -33,6 +37,7 @@ bash /opt/archinstall.git/bin/localization.sh
# Network Configuration
+
bash /opt/archinstall.git/bin/network_configuration.sh $hostname
diff --git a/devel_server.py b/devel_server.py
index 31294ea..8e4ec70 100644
--- a/devel_server.py
+++ b/devel_server.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
# archinstall - A minimal Installation Script for Arch Linux
@@ -17,6 +18,11 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
+#####################
+# devel_server.py #
+#####################
+
+
import sys
from flask import Flask
application = Flask(__name__)