From 380df77b9e1d2754d43af2b2b66598a3ce3d4a31 Mon Sep 17 00:00:00 2001
From: gh2o <git@thegavinli.com>
Date: Sun, 13 Jul 2014 17:47:19 -0700
Subject: [PATCH] move config to pre-transitory

---
 install.sh | 97 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 46 deletions(-)

diff --git a/install.sh b/install.sh
index 20f8ad0..f187aeb 100755
--- a/install.sh
+++ b/install.sh
@@ -190,7 +190,58 @@ bootstrap_system() {
 }
 
 postbootstrap_configuration() {
+
 	log "Doing post-bootstrap configuration ..."
+
+	# set up fstab
+	echo "LABEL=DOROOT / ext4 defaults 0 1" >> /archroot/etc/fstab
+
+	# set up shadow
+	(
+		umask 077
+		(
+			grep    '^root:' /etc/shadow
+			grep -v '^root:' /archroot/etc/shadow
+		) > /archroot/etc/shadow.new
+		cat /archroot/etc/shadow.new > /archroot/etc/shadow
+		rm /archroot/etc/shadow.new
+	)
+
+	# set up network
+	local grepfd
+	local ipaddr netmask gateway prefixlen=24
+	local eni=/etc/network/interfaces
+	exec {grepfd}< <(
+		grep -o 'address [0-9.]\+' ${eni}
+		grep -o 'netmask [0-9.]\+' ${eni}
+		grep -o 'gateway [0-9.]\+' ${eni}
+	)
+	read ignored ipaddr <&${grepfd}
+	read ignored netmask <&${grepfd}
+	read ignored gateway <&${grepfd}
+	exec {grepfd}<&-
+	case ${netmask} in
+		255.255.255.0)
+			prefixlen=24
+			;;
+		255.255.240.0)
+			prefixlen=20
+			;;
+		255.255.0.0)
+			prefixlen=16
+			;;
+	esac
+	cat > /archroot/etc/systemd/network/internet.network <<EOF
+[Match]
+Name=eth0
+
+[Network]
+Address=${ipaddr}/${prefixlen}
+Gateway=${gateway}
+DNS=8.8.8.8
+DNS=8.8.4.4
+EOF
+
 }
 
 error_occurred() {
@@ -309,52 +360,6 @@ transitory_main() {
 
 postinstall_main() {
 
-	# set up fstab
-	echo "LABEL=DOROOT / ext4 defaults 0 1" >> /etc/fstab
-
-	# set up shadow
-	(
-		grep    '^root:' /oldroot/etc/shadow
-		grep -v '^root:' /etc/shadow
-	) > /etc/shadow.new
-	cat /etc/shadow.new > /etc/shadow
-	rm /etc/shadow.new
-
-	# set up network
-	local grepfd
-	local ipaddr netmask gateway prefixlen=24
-	local oldeni=/oldroot/etc/network/interfaces
-	exec {grepfd}< <(
-		grep -o 'address [0-9.]\+' ${oldeni}
-		grep -o 'netmask [0-9.]\+' ${oldeni}
-		grep -o 'gateway [0-9.]\+' ${oldeni}
-	)
-	read ignored ipaddr <&${grepfd}
-	read ignored netmask <&${grepfd}
-	read ignored gateway <&${grepfd}
-	exec {grepfd}<&-
-	case ${netmask} in
-		255.255.255.0)
-			prefixlen=24
-			;;
-		255.255.240.0)
-			prefixlen=20
-			;;
-		255.255.0.0)
-			prefixlen=16
-			;;
-	esac
-	cat > /etc/systemd/network/internet.network <<EOF
-[Match]
-Name=eth0
-
-[Network]
-Address=${ipaddr}/${prefixlen}
-Gateway=${gateway}
-DNS=8.8.8.8
-DNS=8.8.4.4
-EOF
-
 	# enable networkd
 	systemctl enable systemd-networkd
 	systemctl start systemd-networkd