summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorJonathan Bauer2014-01-21 15:01:19 +0100
committerJonathan Bauer2014-01-21 15:01:19 +0100
commitb17d1a8cae1e369d71bcc99ca9521387eeca662b (patch)
tree0876f4639fb25561ed351d1d1f2b642334e5da9f /remote/rootfs
parent[remote/setup_target] only export remote/builds to /export/build if it (diff)
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-b17d1a8cae1e369d71bcc99ca9521387eeca662b.tar.gz
tm-scripts-b17d1a8cae1e369d71bcc99ca9521387eeca662b.tar.xz
tm-scripts-b17d1a8cae1e369d71bcc99ca9521387eeca662b.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage45
1 files changed, 4 insertions, 1 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
index abc28f73..d0a3bc29 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
@@ -50,7 +50,9 @@ else
fi
echo "Appending $MOUNTPOINT to /"
-if ! mount -o "remount,add:1:$MOUNTPOINT=ro" /; then
+if mount -o "remount,append:$MOUNTPOINT=ro" /; then
+ cp -r "${MOUNTPOINT}/"etc/ld.* /etc/ || echo "Could not really copy full blown ldconfig from stage4 to live system"
+else
slxlog --echo "mount-stage4" "Could not append mounted stage4 at '$MOUNTPOINT' to aufs at /"
exit 1
fi
@@ -62,3 +64,4 @@ systemctl reload dbus.service
systemctl start stage4.target &
exit 0
+