From: Dave Young <dyoung@redhat.com>
Date: Thu, 2 Feb 2012 07:59:56 +0000 (+0800)
Subject: fix fstab-sys module check
X-Git-Tag: 015~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fc20802945832e80267982af4eb6557c2669ac7;p=thirdparty%2Fdracut.git

fix fstab-sys module check

If /etc/fstab.sys does not exist installing fstab-sys module will fail.
Fix this by checking use_fstab and fstab_lines as well

Signed-off-by: Dave Young <dyoung@redhat.com>
---

diff --git a/dracut b/dracut
index db97b5861..f74432e58 100755
--- a/dracut
+++ b/dracut
@@ -598,7 +598,7 @@ done
 export initdir dracutbasedir dracutmodules drivers \
     fw_dir drivers_dir debug no_kernel kernel_only \
     add_drivers mdadmconf lvmconf filesystems \
-    use_fstab libdir usrlibdir fscks nofscks cttyhack \
+    use_fstab fstab_lines libdir usrlibdir fscks nofscks cttyhack \
     stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
     debug host_fs_types host_devs sshkey
 
diff --git a/modules.d/95fstab-sys/module-setup.sh b/modules.d/95fstab-sys/module-setup.sh
index ea9db8338..0dc12f3e9 100755
--- a/modules.d/95fstab-sys/module-setup.sh
+++ b/modules.d/95fstab-sys/module-setup.sh
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 check() {
-    test -f /etc/fstab.sys
+    test -f /etc/fstab.sys || [[ -n $use_fstab  ||  -n $fstab_lines ]]
 }
 
 depends() {