Skip to content

Commit

Permalink
feat(dasd): minimize dasd handling consolidated in s390-tools
Browse files Browse the repository at this point in the history
Parsing of rd.dasd is handled by s390-tools zdev dracut module 95zdev as of
ibm-s390-linux/s390-tools@9927023
("zdev/dracut: add rd.dasd cmdline option handling").

Even though this removes one implementation of parsing rd.dasd in dracut,
above s390-tools change introduces another implementation of parsing the
exact same rd.dasd syntax. Therefore, it would be good to keep the
documentation in man/dracut.cmdline.7 of dracut as one central place
describing all s390 device types that dracut handles.

For the time being, keep copying /etc/dasd.conf.
The corresponding call to dasd_cio_free is in 95dasd_mod/parse-dasd-mod.sh
and indirectly triggers processing of /etc/dasd.conf even with the typical
cio_ignore kernel boot parameter ignoring most devices.

Preparation for consolidating persistent configuration with zdev.

Signed-off-by: Steffen Maier <maier@linux.ibm.com>
  • Loading branch information
steffen-maier committed Feb 23, 2024
1 parent 012b26a commit 48cff12
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
6 changes: 2 additions & 4 deletions modules.d/95dasd/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@
check() {
local _arch=${DRACUT_ARCH:-$(uname -m)}
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
require_binaries normalize_dasd_arg || return 1
require_binaries dasdconf.sh || return 1
return 0
}

# called by dracut
depends() {
echo "dasd_mod"
return 0
}

# called by dracut
install() {
inst_hook cmdline 30 "$moddir/parse-dasd.sh"
inst_multiple dasdinfo dasdconf.sh normalize_dasd_arg
inst_multiple dasdconf.sh
conf=/etc/dasd.conf
if [[ $hostonly && -f $conf ]]; then
inst -H $conf
Expand Down
11 changes: 0 additions & 11 deletions modules.d/95dasd/parse-dasd.sh

This file was deleted.

0 comments on commit 48cff12

Please sign in to comment.