From e4a99f7523afaa0bb1ac77eb021d1379be083865 Mon Sep 17 00:00:00 2001 From: Qiao Zhao Date: Thu, 14 May 2015 16:48:58 +0800 Subject: [PATCH] Filtered out "noauto" options in 2nd kernel fstab Customer found when specify "noauto" option in fstab for nfs mount, dump failed. The reason is if "noauto" option is specified in fstab, the mount entry in fstab related to dump target will passed to dracut and stored in kdump initrd. Then during kdump kernel boots this entry containing "noauto" will be ignored by mount service. This cause dump failing. In fact with "noauto" not only nfs dump will fail, non-root disk dump will fail too. root disk dump can dump successfully since root disk can always be mounted by systemd. So now "noauto" need be filtered out when the fstab entry corresponding to dump target contains "noauto". Changelog: v4 -> v5 code comment is not clear enough. supplement it. Signed-off-by: Qiao Zhao Acked-by: Minfei Huang Acked-by: Baoquan He --- mkdumprd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mkdumprd b/mkdumprd index 8cf3c7b..28ecdd7 100644 --- a/mkdumprd +++ b/mkdumprd @@ -117,6 +117,9 @@ to_mount() { _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev) _options=$(findmnt --fstab -f -n -r -o OPTIONS $_dev) [ -z "$_options" ] && _options=$(findmnt -k -f -n -r -o OPTIONS $_dev) + # with 'noauto' in fstab nfs and non-root disk mount will fail in 2nd + # kernel, filter it out here. + _options=$(echo $_options | sed 's/noauto//') _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel # "x-initrd.mount" mount failure will trigger isolate emergency service # W/o this, systemd won't isolate, thus we won't get to emergency.