[PATCH] mkdumprd: Get rid of dependency of /etc/dasd.conf for the kdump

[Minfei Huang]

The kdump service maybe work fine by only several devices in the
config /etc/dasd.conf. We should update the kdump configruation if
specfy the config /etc/dasd.conf, Although the specfied config is not
matter with kdump.

So we can remove the dependency of /etc/dasd.conf, and pick out which
devices the kdump service needs to write in the file /etc/dasd_bus_ids.

Signed-off-by: Minfei Huang <mhuang(a)redhat.com&gt;
---
 mkdumprd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mkdumprd b/mkdumprd
index 25d30eb..b39159e 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -3063,12 +3063,14 @@ EOF
 emit_dasd_device_init() {
     local DEVICE OPTIONS
 
-    cat /etc/dasd.conf | grep -v "^#" | tr "A-Z" "a-z" |
while read DEVICE OPTIONS; do
+    cat $MNTIMAGE/etc/dasd_bus_ids | grep -v "^#" | tr "A-Z"
"a-z" | while read DEVICE; do
         test -n "$DEVICE" || continue
 	emit "echo "free ${DEVICE/0x/}" > /proc/cio_ignore"
 	emit "echo -n 1 > /proc/cio_settle"
 	emit "echo -n 1 > /sys/bus/ccw/devices/${DEVICE/0x/}/online"
 	# Set device options (if specified)
+	test -f /etc/dasd.conf || continue
+	OPTIONS=$(cat /etc/dasd.conf | grep "^$DEVICE" | cut -d " " -f 2-)
 	test -n "$OPTIONS" || continue
 	set $OPTIONS
 	while [ -n "$1" ]; do
@@ -3166,7 +3168,7 @@ fi
 # that tell us what devices we need to wait to see in /sys/block
 
 # first bring DASDs online on s390
-if [ -f /etc/dasd.conf ]; then
+if [ -f $MNTIMAGE/etc/dasd_bus_ids ]; then
     emit_dasd_device_init
 fi
 
-- 
1.8.3.1