From: Harald Hoyer <harald@redhat.com>
Date: Thu, 18 Feb 2010 17:05:51 +0000 (+0100)
Subject: mount-root: also filter "defaults" from mount options
X-Git-Tag: 005~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ec519f8a485f94d0fe7e9d2c458d1a24b9a65ff;p=thirdparty%2Fdracut.git

mount-root: also filter "defaults" from mount options
---

diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index 0ac156d6b..c6b24dad1 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -13,6 +13,7 @@ filter_rootopts() {
     while [ $# -gt 0 ]; do
         case $1 in
             rw|ro);;
+	    defaults);;
             *)
                 v="$v,${1}";;
         esac
@@ -48,7 +49,7 @@ if [ -n "$root" -a -z "${root%%block:*}" ]; then
 
 	rootopts=$(filter_rootopts $rootopts)
 
-	if [ -n "$rootopts" -a "$rootopts" != "defaults" ]; then
+	if [ -n "$rootopts" ]; then
             umount $NEWROOT
             info "Remounting ${root#block:} with -o $rootopts,$rflags"
             mount -t "$rootfs" -o "$rflags","$rootopts" \