summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorJonathan Bauer2014-06-30 16:46:58 +0200
committerJonathan Bauer2014-06-30 16:46:58 +0200
commit4f7bed6b3c6c1a9ef64285a9f2e2ebd305cc2515 (patch)
treef83e674ee3c1f44ff71449bfeb650b0a01603276 /remote
parent[config.tgz] added config module for kdm stuff (diff)
downloadtm-scripts-4f7bed6b3c6c1a9ef64285a9f2e2ebd305cc2515.tar.gz
tm-scripts-4f7bed6b3c6c1a9ef64285a9f2e2ebd305cc2515.tar.xz
tm-scripts-4f7bed6b3c6c1a9ef64285a9f2e2ebd305cc2515.zip
[stage4] fix ldconfig race
Diffstat (limited to 'remote')
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage46
1 files changed, 6 insertions, 0 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 1b7935c7..201e7a26 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
@@ -51,6 +51,12 @@ fi
echo "Appending $MOUNTPOINT to /"
if mount -o "remount,append:$MOUNTPOINT=ro" /; then
+
+ # addons can trigger ldconfig, hence
+ # make sure no ldconfig is running before copying the real ld cache
+ while ps aux|grep -v grep|grep -q ldconfig; do
+ sleep 1
+ done
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 /"