On 09/01/2017 at 10:02 AM, Dave Young wrote:
mkdumprd removes "noauto" mount option, but it also
mistakenly removes
"noauto" within a string. For example ext4 has mount option noauto_da_alloc
mkdumprd will replace it with _da_alloc.
Use '\b' to match a whole word of "noauto" to fix it.
Also do same for s/ro/rw for same reason.
Signed-off-by: Dave Young <dyoung(a)redhat.com>
Reveiwed-by: Xunlei Pang <xlpang(a)redhat.com>
---
mkdumprd | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- kexec-tools.orig/mkdumprd
+++ kexec-tools/mkdumprd
@@ -101,8 +101,9 @@ to_mount() {
[ -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
+ _options=$(echo $_options | sed 's/\bnoauto\b//')
+ #mount fs target as rw in 2nd kernel
+ _options=$(echo $_options | sed 's/\bro\b/rw/')
_mntopts="$_target $_fstype $_options"
#for non-nfs _dev converting to use udev persistent name