Support bind mounts from /etc/initramfs.mounts (bug #418463)

diff --git a/ChangeLog b/ChangeLog
index 44edb0023edf722cd5735628304f5deaf9ea2fdc..6047d4f62b989d1b7b812b3bc644f685be381c78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
+  Support bind mounts from /etc/initramfs.mounts (bug #418463)
+
   28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
   Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 4ff56625fd4a579fc44bbd14838ec0e8c6045787..b6ad58febc604d3187109cd6c0bb3f5f0a6d7c33 100755 (executable)
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -847,8 +847,13 @@ for fs in $fslist; do
        # and not a mountpoint
        [ -z "$dev" ] && continue
        fstype=$(get_mount_fstype $fs)
-       # ro must be trailing, and the options will always contain at least 'defaults'
-       opts="$(get_mount_options $fs | strip_mount_options),ro"
+       if get_mount_options $fs | fgrep -q bind ; then
+               opts='bind'
+               dev=${NEW_ROOT}${dev}
+       else
+               # ro must be trailing, and the options will always contain at least 'defaults'
+               opts="$(get_mount_options $fs | strip_mount_options),ro"
+       fi
        mnt=${NEW_ROOT}${fs}
        cmd="mount -t $fstype -o $opts $dev $mnt"
        good_msg "Mounting $dev as ${fs}: $cmd"