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

cleanup-cruft
Sebastian Pipping 13 years ago
parent b65dae0787
commit aed52e8382

@ -5,6 +5,9 @@
# Distributed under the GPL v2 # Distributed under the GPL v2
# $Id$ # $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: 28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose

@ -847,8 +847,13 @@ for fs in $fslist; do
# and not a mountpoint # and not a mountpoint
[ -z "$dev" ] && continue [ -z "$dev" ] && continue
fstype=$(get_mount_fstype $fs) fstype=$(get_mount_fstype $fs)
# ro must be trailing, and the options will always contain at least 'defaults' if get_mount_options $fs | fgrep -q bind ; then
opts="$(get_mount_options $fs | strip_mount_options),ro" 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} mnt=${NEW_ROOT}${fs}
cmd="mount -t $fstype -o $opts $dev $mnt" cmd="mount -t $fstype -o $opts $dev $mnt"
good_msg "Mounting $dev as ${fs}: $cmd" good_msg "Mounting $dev as ${fs}: $cmd"

Loading…
Cancel
Save