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

5 files changed, 25 insertions, 14 deletions

diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
index 20e789a4..4e663d56 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Setup local disk partitions (tmp, swap)
-After=sysinit.target
-Before=shutdown.target
 DefaultDependencies=no
+Before=sysinit.target shutdown.target
+Wants=sysinit.target
 
 [Service]
 Type=oneshot
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service
index acc827c9..6a5b63ad 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/setup-slx-addons.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Download, mount and append SLX addons
-After=sysinit.target setup-partitions.service
-Wants=setup-partitions.service
+After=setup-partitions.service
+DefaultDependencies=no
 
 [Service]
 Type=oneshot
 ExecStart=/opt/openslx/scripts/systemd-setup_slx_addons
 RemainAfterExit=yes
+
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
index c4f45a3c..21a09b7c 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/update-etc_issue.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Update /etc/issue
-Before=sysinit.target shutdown.target
+Before=getty.target shutdown.target
 DefaultDependencies=no
 
 [Service]
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time
index 3e644abd..87c93fd4 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time
@@ -3,13 +3,13 @@
 . /opt/openslx/config || { echo "Could not source config!"; exit 1; }
 SLX_NTP_SERVER="$SLX_NTP_SERVER 0.de.pool.ntp.org"
 for SERVER in $SLX_NTP_SERVER; do
-	if ntpdate -u -b "$SERVER"; then
+	if ntpdate -u -p 2 "$SERVER"; then
 		echo "Successfully queried $SERVER for time."
 		if [ "x$SLX_BIOS_CLOCK" = "xlocal" ]; then
-			sleep 1
+			usleep 100000
 			hwclock -l -w || echo "... but could not set BIOS clock to localtime"
 		elif [ "x$SLX_BIOS_CLOCK" = "xutc" ]; then
-			sleep 1
+			usleep 100000
 			hwclock -u -w || echo "... but could not set BIOS clock to UTC"
 		fi
 		exit 0
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index bc5ce9c1..b0f606dd 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -52,6 +52,21 @@ diskfm () {
 }
 
 function mount_temp () {
+	local PRE=$(pwd)
+	if ! cd /tmp; then
+		mount_temp_fallback $@
+		return $?
+	fi
+	mount $@ /tmp || return 1
+	chmod a+rwxt /tmp
+	# Move stuff from working directory, which is old /tmp, to new /tmp just mounted
+	mv ./* ./.[!.]* ./..?* /tmp/ 2> /dev/null
+	local OLD=$(LANG=C ls -alh | grep -v -E ' \.\.?$' | grep -v '^total')
+	[ -n "$OLD" ] && echo -- "Leftovers:" && echo -- "$OLD"
+	cd "$PRE"
+}
+
+function mount_temp_fallback () {
 	mkdir -p /tmptmp
 	mv /tmp/* /tmp/.* /tmptmp/ 2> /dev/null
 	mount $@ /tmp || return 1
@@ -61,12 +76,7 @@ function mount_temp () {
 	return 0
 }
 
-# Check for local harddisks and appropriate partitions
-for waiting in 1 1 2 3 4; do
-	fdisk -l | sed -n "/^\/dev\//p" > "/etc/disk.partition"
-	[ -s "/etc/disk.partition" ] && break
-	sleep "$waiting"
-done
+fdisk -l | sed -n "/^\/dev\//p" > "/etc/disk.partition"
 echo "Partitions:"
 cat "/etc/disk.partition"