summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2014-02-14 19:47:53 +0100
committerSimon Rettberg2014-02-14 19:47:53 +0100
commita4cb1bf1bdf6f4250b12e8a3391ae3d8878c0c83 (patch)
tree7003d4f3ffd94e0ae1f8d81129fcdcf2fa424617
parentOverhauled vmware kernel module patching, also added global kernel version va... (diff)
downloadtm-scripts-a4cb1bf1bdf6f4250b12e8a3391ae3d8878c0c83.tar.gz
tm-scripts-a4cb1bf1bdf6f4250b12e8a3391ae3d8878c0c83.tar.xz
tm-scripts-a4cb1bf1bdf6f4250b12e8a3391ae3d8878c0c83.zip
[rfs-stage32] Make sure addons are inserted into the aufs stack before stage4, so they can override files
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons2
1 files changed, 1 insertions, 1 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
index c7ce64b9..5bed4c7f 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
@@ -75,7 +75,7 @@ if [ $# -eq 1 ]; then
# now append it to /
echo "Appending ${ADDON_MOUNT_POINT} to /"
- if ! mount -o "remount,append:${ADDON_MOUNT_POINT}=ro" / ; then
+ if ! mount -o "remount,ins:2:${ADDON_MOUNT_POINT}=ro" / ; then # ins:2 makes sure the addon is after tmpfs and stage32, but before stage4
slxlog --echo "Failed to append ${ADDON_MOUNT_POINT} to the aufs. Cleaning up..."
umount -l ${ADDON_MOUNT_POINT} || echo "Could not unmount ${ADDON_MOUNT_POINT}!"
exit 1