diff --git a/.gitattributes b/.gitattributes index 9b03811..254d368 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +dracut-zdev-live-20230321.tar filter=lfs diff=lfs merge=lfs -text diff --git a/dracut-zdev-live-20230321.tar b/dracut-zdev-live-20230321.tar new file mode 100644 index 0000000..b525ba8 --- /dev/null +++ b/dracut-zdev-live-20230321.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1862ca7d850d76c393d594681b2aaef8c7101c6c38ea697d32ffab6d45db620e +size 10240 diff --git a/module-setup.sh b/module-setup.sh deleted file mode 100644 index 1460231..0000000 --- a/module-setup.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# called by dracut -check() { - arch=${DRACUT_ARCH:-$(uname -m)} - [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 - - require_binaries chzdev || return 1 - - [[ $hostonly ]] || return 0 - - # or on request - return 255 -} - -# called by dracut -depends() { - echo bash - return 0 -} - -# called by dracut -installkernel() { - instmods ctcm lcs qeth qeth_l2 qeth_l3 dasd_diag_mod dasd_eckd_mod dasd_fba_mod -} - -# called by dracut -install() { - inst_hook cmdline 41 "$moddir/parse-zdev-suse.sh" - inst_hook cleanup 41 "$moddir/write-udev-live-suse.sh" - inst_multiple chzdev -} diff --git a/parse-zdev-suse.sh b/parse-zdev-suse.sh deleted file mode 100644 index d2b6d43..0000000 --- a/parse-zdev-suse.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -for zdev in $(getargs rd.zdev -d 'rd_ZDEV='); do - IFS=, read -r z_drv z_chan znet_opts <<< "$zdev" - if [ -n "$z_drv" ] && [ "$z_drv" = "no-auto" ] ; then - : # ignore, as it's handled by 95zdev - elif [ -z "$z_drv" ] || [ -z "$z_chan" ]; then - warn "Invalid arguments for rd.zdev=" - else - info "+ chzdev --persistent --enable [...] $z_drv $z_chan $z_opts" - chzdev --persistent --enable --force --yes --no-root-update --no-settle $z_drv $z_chan $z_opts - fi -done - -# REMOVE everything below for FCS! -# support initial implementation only for already deployed `parmfile`s -for znet in $(getargs rd.znet -d 'rd_ZNET='); do - IFS=, read -r znet_drv znet_sc0 znet_sc1 znet_sc2 znet_options <<< "$znet" - if [ -z "$znet_drv" ] || [ -z "$znet_sc0" ] || [ -z "$znet_sc1" ] || [ -z "$znet_sc2" ] ; then - warn "Invalid arguments for rd.znet=" - else - info "+ chzdev --persistent --enable $znet_drv $znet_sc0:$znet_sc1:$znet_sc2 $znet_options" - chzdev --persistent --enable --force --yes --no-root-update --no-settle $znet_drv $znet_sc0:$znet_sc1:$znet_sc2 $znet_options - fi -done - -for dasd in $(getargs rd.dasd -d 'rd_DASD='); do - dasd_drv=dasd - IFS=, read -r dasd_sc0 dasd_options <<< "$dasd" - if [ -z "$dasd_sc0" ]; then - warn "Invalid arguments for rd.dasd=" - else - info "+ chzdev --persistent --enable $dasd_drv $dasd_sc0 $dasd_options" - chzdev --persistent --enable --force --yes --no-root-update --no-settle $dasd_drv $dasd_sc0 $dasd_options - fi -done - diff --git a/read_values.c b/read_values.c index 1f4f65b..2e2072d 100644 --- a/read_values.c +++ b/read_values.c @@ -378,7 +378,7 @@ int print_uuid() result_string = NULL; } - printf("\n", result_string); + printf("%s\n", result_string); return 0; } /* print_uuid */ diff --git a/s390-tools.changes b/s390-tools.changes index 6bb4263..fbaf6e6 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- -Wed Mar 22 12:13:52 UTC 2023 - Nikolay Gueorguiev +Thu Mar 23 12:45:57 UTC 2023 - Nikolay Gueorguiev -- Added SUSE scripts - * module-setup.sh - * parse-zdev-suse.sh - * write-udev-live-suse.sh +- Allow activation of devices at boot via kernel command line + for live installation media (jsc#PED-2975) + * Added a Source dracut-zdev-live-20230321.tar + * Updated the .spec file for the new Source ------------------------------------------------------------------- Mon Mar 13 15:33:43 UTC 2023 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index 683b382..68289d7 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -105,9 +105,8 @@ Source39: vmlogrdr.service.suse Source40: xpram.service Source41: pkey.conf ### -Source42: module-setup.sh -Source43: parse-zdev-suse.sh -Source44: write-udev-live-suse.sh +Source42: dracut-zdev-live-20230321.tar + ### ### Obsolete scripts and man pages to be removed once changes in other tools are made ### That's been delayed to at least SLES12 SP1, but I'm leaving the comments here. @@ -328,7 +327,7 @@ volume. If available, it reconfigures the FCP re-IPL settings to use an operational path. %prep -%autosetup -p1 +%autosetup -p1 -a 42 cp -vi %{SOURCE22} CAUTION @@ -398,6 +397,11 @@ cp %{SOURCE18} zpxe.rexx cp %{SOURCE2} zipl.conf.sample cp %{SOURCE23} README.SUSE +### Adding SUSE scripts +install -d -m 755 %{buildroot}%{_prefix}/lib/dracut/modules.d +cp -a 96zdev-live %{buildroot}%{_prefix}/lib/dracut/modules.d +### + cd %{buildroot} install -D -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/scripts/hsnc install -D -m644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.hsnc @@ -466,6 +470,7 @@ rm -fv %{buildroot}%{_mandir}/man8/chmem.8* rm -fv %{buildroot}%{_mysbindir}/lsmem rm -fv %{buildroot}%{_mysbindir}/chmem +### find . ! -type d | sed 's/^.//;\-/man/-s/^.*$/%doc &.gz/' > %{_builddir}/%{name}-filelist grep -v -E 'osasnmp|etc/ziplenv|\.conf$|ekmfweb.so|ekmfweb.h|kmipclient|kmip/profiles/.*profile$|chreipl-fcp-mpath' %{_builddir}/%{name}-filelist >%{_builddir}/%{name}.list @@ -677,6 +682,7 @@ done %dir %{_datadir}/s390-tools/netboot %dir %{_datadir}/s390-tools/genprotimg %dir %{_prefix}/lib/dracut/modules.d/95zdev +%dir %{_prefix}/lib/dracut/modules.d/96zdev-live %dir %{_prefix}/lib/dracut/modules.d/99ngdump %dir /boot/zipl %dir %{_libdir}/zkey diff --git a/write-udev-live-suse.sh b/write-udev-live-suse.sh deleted file mode 100644 index 67baf45..0000000 --- a/write-udev-live-suse.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -w /sysroot/etc/udev/rules.d ]; then - # chzdev generated device activation starts with 41 ... - cp -p /etc/udev/rules.d/41-* /sysroot/etc/udev/rules.d -fi