Merge branch 'bug-418463'

Conflicts:
	ChangeLog

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)
+
   02 Jun 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
   arch/x86_64/modules_load, defaults/modules_load:
   Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk

defaults/linuxrc

@@ -847,8 +847,13 @@ for fs in $fslist; do
 	# and not a mountpoint
 	[ -z "$dev" ] && continue
 	fstype=$(get_mount_fstype $fs)
+	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"