diff --git a/zdev/dracut/95zdev-kdump/module-setup.sh b/zdev/dracut/95zdev-kdump/module-setup.sh index 300b8e97..328732ef 100755 --- a/zdev/dracut/95zdev-kdump/module-setup.sh +++ b/zdev/dracut/95zdev-kdump/module-setup.sh @@ -25,7 +25,7 @@ check() { zdev_is_kdump || return 1 # Ensure that required tools are available - require_binaries chzdev || return 1 + require_binaries chzdev lszdev || return 1 return 0 } @@ -61,8 +61,8 @@ install() { # many zFCP LUNs inst_dir /etc/modprobe.d chzdev zfcp --type "allow_lun_scan=0" --persistent \ - --base "/etc=${initdir:?}/etc" --yes --quiet --no-root-update \ - --force >/dev/null + --base "/etc=${initdir:?}/etc" --yes --no-root-update \ + --force 2>&1 | ddebug # drop /etc/zfcp.conf from dracut module 95zfcp echo "rd.zfcp.conf=0" > "$initdir/etc/cmdline.d/00-no-zfcp-conf.conf" # => only activate individual zfcp paths found as required below @@ -81,9 +81,14 @@ install() { for_each_host_dev_and_slaves_all check_zdev sed -i -e 's/^\[active /\[persistent /' "$_tempfile" + ddebug < "$_tempfile" + # Apply via --import to prevent other devices from being configured chzdev --import "$_tempfile" --persistent --base "/etc=$initdir/etc" \ - --yes --quiet --no-root-update --force >/dev/null + --yes --no-root-update --force 2>&1 | ddebug + + lszdev --configured --persistent --info \ + --base "/etc=$initdir/etc" 2>&1 | ddebug rm -f "$_tempfile" diff --git a/zdev/dracut/95zdev/module-setup.sh b/zdev/dracut/95zdev/module-setup.sh index c2592553..95351d64 100644 --- a/zdev/dracut/95zdev/module-setup.sh +++ b/zdev/dracut/95zdev/module-setup.sh @@ -90,16 +90,21 @@ install() { --quiet 2>/dev/null >> "$_tempfile" done + ddebug < "$_tempfile" + # Apply via --import to prevent other devices from being configured chzdev --import "$_tempfile" --persistent --base "/etc=${initdir:?}/etc" \ - --yes --quiet --no-root-update --force >/dev/null + --yes --no-root-update --force 2>&1 | ddebug # Apply site-specific configurations via --import for (( site=0; site<10; site++ )) do chzdev --import "$_tempfile" --persistent --base "/etc=$initdir/etc" \ - --site $site --yes --quiet --no-root-update --force >/dev/null + --site $site --yes --no-root-update --force 2>&1 | ddebug done + lszdev --configured --persistent --info \ + --base "/etc=$initdir/etc" 2>&1 | ddebug + rm -f "$_tempfile" return 0