Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

Conflicts:
	remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger

11 files changed, 68 insertions, 28 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_network b/remote/rootfs/rootfs-stage31/data/inc/setup_network
index ed29050f..9e52cfaa 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/setup_network
+++ b/remote/rootfs/rootfs-stage31/data/inc/setup_network
@@ -58,6 +58,8 @@ for LINE in $IP_OUT; do
 		else
 			NOIPYET="yes"
 		fi
+		# Ignore this device later on when systemd handles network interfaces (see hacked 99-systemd.rules in systemd data dir)
+		echo "SUBSYSTEM==\"net\", ACTION==\"add\", KERNEL==\"eth*\", ATTR{address}==\"$IFMAC\", TAG+=\"openslxignore\"" >> "${FUTURE_ROOT}/etc/udev/rules.d/01-ignore-boot-interface.rules"
 	fi
 	# youdev
 	echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"$IFMAC\", ATTR{dev_id}==\"0x0\", ATTR{type}==\"1\", KERNEL==\"eth*\", NAME=\"$IFACE\"" >> "${FUTURE_ROOT}/etc/udev/rules.d/70-net-boot-nic-name.rules"
diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
index f0380ece..57ad09e1 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
+++ b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
@@ -45,6 +45,7 @@ FUTURE_ROOT="/mnt"
 
 # Move network stuff
 cp /etc/hostname /etc/hosts /etc/resolv.conf   "${FUTURE_ROOT}/etc/"
+[ -s "/run/config" ] && cat "/run/config" >> "${FUTURE_ROOT}/opt/openslx/config"
 
 # "Delete" addon hook-script in aufs view
 touch "/mnt/opt/openslx/uniontmp/.wh.addon-init"
diff --git a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
index 1d4fff7a..50ace72e 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
+++ b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
@@ -45,7 +45,11 @@ fi
 rm -f -- "/etc/resolv.conf"
 
 # DNS/domain?
-[ -n "$dns" ] && echo "..got DNS.."
+if [ -n "$dns" ]; then
+	echo "..got DNS.."
+	echo "# From DHCP in stage 3.1" >> "/run/config"
+	echo "SLX_DNS='$dns'" >> "/run/config"
+fi
 for serv in $dns; do
 	echo "nameserver $serv" >> "/etc/resolv.conf"
 done
@@ -75,6 +79,11 @@ if [ -n "$hostname" ]; then
 	echo "..setting hostname $hostname (fqdn: $fqdn).."
 	echo "$fqdn" > "/proc/sys/kernel/hostname"
 	echo "$fqdn" > "/etc/hostname"
+<<<<<<< HEAD
 	echo "$ip $fqdn $hostname" >> "/etc/hosts"
+=======
+	echo "$ip $fqdn $hostname" > "/etc/hosts"
+	echo "SLX_HOSTNAME='$hostname'" >> "/run/config"
+>>>>>>> 7d9fdc9dc8069ddb9f55a527119cc86894f2ed3b
 fi
 
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index ac058591..250767e3 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -41,13 +41,7 @@ setup_gfx () {
 		#echo "Trying to load module $DRM"
 		modprobe "$DRM" 2>/dev/null
 	done
-	# start plymouth if activated
-	#if [ $DEBUG -lt 1 ]; then
-	#	echo "Starting plymouth..."
-	#	# link the theming directory from the config to the current root
-	#	ln -sf "${FUTURE_ROOT}/usr/share" /usr/share
-	#	lymouthd --kernel-command-line="splash" --tty=/dev/tty7 && plymouth show-splash
-	#fi
+	# start some kind of splash screen if activated
 }
 
 setup_gfx &
@@ -57,44 +51,41 @@ mdev -s
 
 # read kernel command line for debugging switch
 DEBUG=0
-read KCL < /proc/cmdline
-export KCL
+read KCL < "/proc/cmdline"
 for opts in ${KCL}; do
 	case "${opts}" in
 		debug=*)
 			DEBUG=${opts#debug=} ;;
 		ip=*)
 			# process IP info
-			export IPINFO=${opts#ip=} ;;
+			IPINFO=${opts#ip=} ;;
 		nfs=*)
-			export NFS=${opts#nfs=}
-			export NFSPATH=${nfs#*:}
-			export NFSSERVER=${nfs%:/*}
+			NFS=${opts#nfs=}
+			NFSPATH=${NFS#*:}
+			NFSSERVER=${NFS%:/*}
 			;;
 		BOOTIF=*)
-			export MAC="$( echo "$opts" | cut -b 11- | tr '-' ':' | tr '[A-Z]' '[a-z]' )" ;; # make mac lowercase for udev (see setup_network)
+			MAC="$( echo "$opts" | cut -b 11- | tr '-' ':' | tr '[A-Z]' '[a-z]' )" ;; # make mac lowercase for udev (see setup_network)
 	esac
 done
 
 # suppress kernel output if DEBUG is not set
 [ $DEBUG -ge 1 ] && echo "0" > /proc/sys/kernel/printk || echo "4 4 1 7" >/proc/sys/kernel/printk
 
-[ $DEBUG -ge 5 ] && drop_shell "Requested Debug Shell: before network."
+[ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: before network."
 
 . "/inc/setup_network" || drop_shell "Error setting up network"
 
-[ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: after network/before configuring."
+[ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: after network/before configuring."
 
 . "/inc/activate_sysconfig" || drop_shell "Could not source /bin/activate_sysconfig"
 
-[ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: after network/before configuring."
-
 [ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after configuration/before stage32."
 
 . "/inc/setup_stage32" || drop_shell "Problem setting up stage3.2"
 
 # copy files needed for stage3.2 to FUTURE_ROOT
-[ $DEBUG -ge 1 ] && echo "Copying busybox etc. to stage32..."
+echo "Copying busybox etc. to stage32..."
 tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/etc/functions.inc" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/"
 
 # set the SLX_ROOT_PASS if given in config
@@ -105,17 +96,14 @@ fi
 # one last debug shell if activated
 [ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell: before switch_root."
 
-# tell plymouth about the immediate rootfs switch
-#[ $DEBUG -lt 1 ] && plymouth update-root-fs --new-root-dir=/mnt
-
 # unmount filesystems
 for mnt in proc sys run ; do
-	busybox umount -n "$mnt" 2>/dev/null
+	busybox umount -f -l "/$mnt" 2>/dev/null
 done
 
 echo "Switching root...."
 # Prepare environment (HOME is needed as a hack for nss_ldap with ssl and no caching)
-unset BOOT_IMAGE initrd KCL ip slxbase slxsrv IPINFO vga ip MAC BOOTIF
+unset BOOT_IMAGE initrd KCL ip slxbase slxsrv IPINFO vga ip MAC BOOTIF DEBUG
 export HOME=/
 export init="/usr/lib/systemd/systemd"
 export recovery=
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service
new file mode 100644
index 00000000..4713dae1
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/early-network-triggers.service
@@ -0,0 +1,12 @@
+# This will trigger network.target etc. at an early point,
+# if network setup happened in stage31 (dhcp...)
+[Unit]
+Description=Trigger network targets early
+DefaultDependencies=no
+Wants=systemd-tmpfiles-setup.service
+Before=sysinit.target
+After=systemd-tmpfiles-setup.service
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/scripts/systemd-early_network_triggers
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target
index c0b7793b..bc12cd1b 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-dns.target
@@ -1,4 +1,4 @@
 [Unit]
-
 Description=DNS Server available
+ConditionPathExists=/run/network/dns-ready
 
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target
index cfeb719c..770eb697 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/network-gateway.target
@@ -1,3 +1,4 @@
 [Unit]
-
 Description=Default route configured
+ConditionPathExists=/run/network/gateway-ready
+
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service
index a48375d0..ebaa9afb 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service
@@ -2,7 +2,6 @@
 Description=Update date from local time server
 After=network.target
 Requires=network.target
-ConditionPathExists=/run/udhcpc/network-ready
 
 [Service]
 Type=oneshot
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/early-network-triggers.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/early-network-triggers.service
new file mode 120000
index 00000000..8aec0a6d
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/early-network-triggers.service
@@ -0,0 +1 @@
+../early-network-triggers.service
\ No newline at end of file
diff --git a/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf
new file mode 100644
index 00000000..dd67e785
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/tmpfiles.d/network.conf
@@ -0,0 +1 @@
+D /run/network 0755 root root
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-early_network_triggers b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-early_network_triggers
new file mode 100755
index 00000000..dc639535
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-early_network_triggers
@@ -0,0 +1,26 @@
+#!/bin/ash
+
+# This script will trigger several network targets if
+# applicable at an early point.
+# This happens if dhcp/network setup was successful in stage31
+
+# Main interface
+BRIDGE="br0"
+
+if [ ! -e "/sys/class/net/${BRIDGE}/operstate" -o "x$(cat "/sys/class/net/${BRIDGE}/operstate")" == "xup" ] && [ -e "/opt/openslx/uniontmp/etc/hostname" -o -e "/opt/openslx/uniontmp/etc/resolv.conf" ]; then
+	touch "/run/network/network-ready"
+	systemctl start network.target &
+fi
+
+if [ -s "/etc/resolv.conf" ] && grep -q "^nameserver" "/etc/resolv.conf"; then
+	touch "/run/network/dns-ready"
+	systemctl start network-dns.target &
+fi
+
+if route -n | grep -q -E '^0\.0\.0\.0.*U.*G'; then
+	touch "/run/network/gateway-ready"
+	systemctl start network-gateway.target &
+fi
+
+exit 0
+