Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init

1 files changed, 38 insertions, 0 deletions

diff --git a/testModule/hooks/pre-pivot/mount-tmp.sh b/testModule/hooks/pre-pivot/mount-tmp.sh
new file mode 100755
index 00000000..3fa24cce
--- /dev/null
+++ b/testModule/hooks/pre-pivot/mount-tmp.sh
@@ -0,0 +1,38 @@
+# This script only checks if we found a usable partition for the
+# future /tmp. The discovery of that partition is done by udev during
+# the initqueue. If a valid partition is found (either GPT with the label
+# OPENSLX_TMP or MBR with the type 0x44) its path will be written to
+# /tmp/openslx.tmpdisk
+OPENSLX_TMP_DISK_FLAG="/tmp/openslx.disk.tmp"
+
+if [ ! -e "$OPENSLX_TMP_DISK_FLAG" ]; then
+	warn "'$OPENSLX_TMP_DISK_FLAG' not found!"
+	warn "Systemd will manage $NEWROOT/tmp on its own."
+	# no partition for the future /tmp found, just
+	# let systemd manage it then (probably a tmpfs)
+	return 1
+fi
+
+# in /tmp/openslx.disk.tmp is the name of the device
+# to mount as /tmp in the real system
+# meaning we need to mount it to /sysroot/tmp here.
+
+OPENSLX_TMP_DISK_DEV="$(cat $OPENSLX_TMP_DISK_FLAG)"
+
+# sanity check: is the content a block device?
+if [ ! -b "$OPENSLX_TMP_DISK_DEV" ]; then
+	warn "'$OPENSLX_TMP_DISK_DEV' appears not to be a block device!"
+	warn "Systemd will manage $NEWROOT/tmp on its own."
+	return 1
+fi
+
+# all good, keep on
+if ! mount -t auto "$OPENSLX_TMP_DISK_DEV" /sysroot/tmp; then
+	# something else went wrong :(
+	warn "Mounting '$OPENSLX_TMP_DISK_DEV' to '/sysroot/tmp' failed with: $!"
+	warn "Systemd will manage $NEWROOT/tmp on its own."
+	return 1
+fi
+
+# still here? mount worked wohoo
+return 0