[kexec-tools/f20] mkdumprd fail if target is NFS and mounted on /var/crash

[WANG Chao]

commit f5947e95de8f7f92e044a1fb315192db5a8ece1f
Author: Baoquan He <bhe at redhat.com>
Date:   Mon Mar 24 17:15:28 2014 +0800

    mkdumprd fail if target is NFS and mounted on /var/crash
    
    Now when dump target is not specified, separate disk can't be mounted on
    "path", e.g /var/crash. However if target is specified, whatever the default
    fail action is set, mkdumprd should go ahead and not be failed.
    
    In check_block_dump_target(), the check only on disk is not complete,
    NFS and ssh need be filtered too. So introduce is_user_configured_dump_target
    to check this.
    
    Signed-off-by: Baoquan He <bhe at redhat.com>
    Acked-by: Vivek Goyal <vgoyal at redhat.com>

 kdump-lib.sh |   14 ++++++++++++++
 mkdumprd     |    3 +--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/kdump-lib.sh b/kdump-lib.sh
index 384f7b4..de32650 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -52,6 +52,20 @@ get_user_configured_dump_disk()
     return
 }
 
+is_user_configured_dump_target()
+{
+    local _target
+
+    if is_ssh_dump_target || is_nfs_dump_target; then
+        return 0
+    fi
+
+    _target=$(egrep "^ext[234]|^xfs|^btrfs|^minix|^raw" /etc/kdump.conf 2>/dev/null |awk '{print $2}')
+    [ -n "$_target" ] && return 0
+
+    return 1
+}
+
 get_root_fs_device()
 {
     local _target
diff --git a/mkdumprd b/mkdumprd
index bb1e01e..84f1e18 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -363,8 +363,7 @@ check_block_dump_target()
     local _target
     local _mntpoint
 
-    _target=$(get_user_configured_dump_disk)
-    [ -n "$_target" ] && return
+    is_user_configured_dump_target && return
 
     _target=$(get_root_fs_device)
     if [ -b "$_target" ]; then