From 6fe631aae5e2f80f86b19dcd8cae5e546bc3f009 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 11 Sep 2013 18:00:19 +0200
Subject: [mount_export] Fix collision with mount points for addons

---
 .../data/opt/openslx/scripts/systemd-mount_export             | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'remote')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
index 3d012360..988dc3d7 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
@@ -4,7 +4,10 @@
 
 [ -z "${SLX_STAGE4_NFS}" ] && { echo "SLX_STAGE4_NFS is not set in /opt/openslx/config." && exit 1; }
 
-echo "Mounting ${SLX_STAGE4_NFS} to /opt/openslx/mnt"
-mount -t nfs -o ro,async,nolock,vers=3 "$SLX_STAGE4_NFS" /opt/openslx/mnt || { echo "Fail." && exit 1; }
-echo "Appending /opt/openslx/mnt to /"
-mount -o remount,append:/opt/openslx/mnt=ro / || { echo "Fail." && exit 1; }
+MOUNTPOINT="/opt/openslx/mnt/stage4"
+mkdir -p "$MOUNTPOINT"
+echo "Mounting ${SLX_STAGE4_NFS} to $MOUNTPOINT"
+mount -t nfs -o ro,async,nolock,vers=3 "$SLX_STAGE4_NFS" "$MOUNTPOINT" || { echo "Fail." && exit 1; }
+echo "Appending $MOUNTPOINT to /"
+mount -o "remount,append:$MOUNTPOINT=ro" / || { echo "Fail." && exit 1; }
+
-- 
cgit v1.2.3-55-g7522