diff options
| author | Christian Rößler | 2013-09-11 18:07:07 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-09-11 18:07:07 +0200 |
| commit | 419174af772e8d421025834af0ad4a18a39a3d6f (patch) | |
| tree | 367ce13e7f6bd20e72c38e34a817cd8e6eefbfef | |
| parent | [vbox] Added path patch for vboxheadless, debian/ubuntu suid VBoxHeadless (diff) | |
| parent | [mount_export] Fix collision with mount points for addons (diff) | |
| download | tm-scripts-419174af772e8d421025834af0ad4a18a39a3d6f.tar.gz tm-scripts-419174af772e8d421025834af0ad4a18a39a3d6f.tar.xz tm-scripts-419174af772e8d421025834af0ad4a18a39a3d6f.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export | 11 |
1 files changed, 7 insertions, 4 deletions
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; } + |