forked from pool/s390-tools
6a6c0cb679
*** v2.34.0
* Changes of existing tools:
- ap_tools/ap-check: Add support for vfio-ap dynamic configuration
- dbginfo.sh: Update/Add additional DASD data collection
- dumpconf: Add new parameter 'SCP_DATA' for SCSI/NVMe/ECKD dump devices
- libutil: Make formatted meta-data configurable
- s390-tools: Replace 'which' with built-in 'command -v'
- zdump/dfi_elf: Support core dumps of vr-kernels
* Bug Fixes:
- chzdev: Fix warning about failed ATTR writes by udev
- rust/pv: Try again if first CRL-URI is invalid
- rust/pvattest: Add short option for --arpk
- zdump: Fix 'zgetdump -i' ioctl error on s390 formatted dump file
*** v2.33.1
* Bug Fixes:
- s390-tools: Fix formatting and typos in README.md
- s390-tools: Fix release string
*** v2.33.0
* Add new tools / libraries:
- chpstat: New tool for displaying channel path statistics
- libutil: Add output format helpers(util_fmt: JSON, JSON-SEQ, CSV, text pairs)
* Changes of existing tools / libraries:
- chzdev: Add --is-owner to identify files created by zdev
- dasdfmt: Change default mode to always use full-format (Note: affects ESE DASD)
- libap: Significantly reduce delay time between file lock retries
- pvattest: Rewrite from C to Rust
- pvattest: Support additional data & user-data
- rust/pv: Support for Attestation
* Bug Fixes:
- chreipl: Improve disk type detection when running under QEMU
- dbginfo.sh: Use POSIX option with uname
- s390-tools: Fix missing hyphen escapes in the man page for many tools
- zipl/src: Fix bugs in disk_get_info() reproducible in corner cases
*** v2.32.0
* Changes of existing tools:
- cpumf/lscpumf: add support for machine type 3932
- genprotimg, pvattest, and pvsecret accept IBM signing key with Armonk as
subject locality
- zdump/zipl: Support for List-Directed dump from ECKD DASD
- zkey: Detect FIPS mode and generate PBKDF for luksFormat according to it
* Bug Fixes:
- dbginfo.sh: dash compatible copy sequence
- rust/pv_core: Fix UvDeviceInfo::get() method
- zipl/src: Fix leak of files if run with a broken configuration
- zkey: Fix convert command to accept only keys of type CCA-AESDATA
* Revendored vendor.tar.gz
* Removed obsolete patches
- s390-tools-sles15sp5-01-rust-pv-support-Armonk-in-IBM-signing-key-subject.patch
- s390-tools-sles15sp6-02-genprotimg-support-Armonk-in-IBM-signing-key-subject.patch
- s390-tools-sles15sp6-03-libpv-support-Armonk-in-IBM-signing-key-subject.patch
- s390-tools-sles15sp6-04-pvattest-Fix-root-ca-parsing.patch
- s390-tools-sles15sp6-genprotimg-makefile.patch
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=219
134 lines
4.4 KiB
Diff
134 lines
4.4 KiB
Diff
---
|
|
zdev/dracut/96zdev-live/module-setup.sh | 32 +++++++++++++++++++++++++
|
|
zdev/dracut/96zdev-live/parse-zdev-live.sh | 36 +++++++++++++++++++++++++++++
|
|
zdev/dracut/96zdev-live/write-udev-live.sh | 11 ++++++++
|
|
zdev/dracut/Makefile | 15 ++++++++++--
|
|
4 files changed, 92 insertions(+), 2 deletions(-)
|
|
|
|
--- /dev/null
|
|
+++ b/zdev/dracut/96zdev-live/module-setup.sh
|
|
@@ -0,0 +1,32 @@
|
|
+#!/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-live.sh"
|
|
+ inst_hook cleanup 41 "$moddir/write-udev-live.sh"
|
|
+ inst_multiple chzdev
|
|
+}
|
|
--- /dev/null
|
|
+++ b/zdev/dracut/96zdev-live/parse-zdev-live.sh
|
|
@@ -0,0 +1,36 @@
|
|
+#!/bin/bash
|
|
+#
|
|
+# 96zdev-live/parse-zdev-live.sh
|
|
+# Parse the kernel command line for rd.zdev kernel parameters. These
|
|
+# parameters are evaluated and used to configure z Systems specific devices
|
|
+# with chzdev(8), especially for use on live/installation type media.
|
|
+# Note: this is only active on no-hostonly initrds (by default).
|
|
+#
|
|
+# Format:
|
|
+# rd.zdev=TYPE,DEVICE[,SETTINGS]
|
|
+#
|
|
+# where
|
|
+#
|
|
+# TYPE: all device types supported by chzdev(8), like qeth and dasd
|
|
+# DEVICE: device specification as supported by chzdev(8) '--enable',
|
|
+# with the exception of specifying multiple devices, which
|
|
+# need to be separated by commas. Channel group members
|
|
+# (or zFCP parameters) in turn are separated by colons.
|
|
+# SETTINGS: Settings are positional arguments of chzdev in the form
|
|
+# KEY=VALUE separated by commas.
|
|
+
|
|
+zdev_enable="--persistent --enable"
|
|
+zdev_base_args="--yes --no-root-update --no-settle"
|
|
+
|
|
+for zdevs in $(getargs rd.zdev) ; do
|
|
+ IFS=',' read -r -a zdev <<< "$zdevs"
|
|
+ if [ -n "$zdev" ] && [ "$zdev" = "no-auto" -o "$zdev" = "auto" ] ; then
|
|
+ : # ignore, as it's handled by 95zdev
|
|
+ elif [ -z "$zdev" ] || [ -z "${zdev[1]}" ] ; then
|
|
+ warn "Unsupported usage of rd.zdev=$zdevs"
|
|
+ else
|
|
+ info "+ chzdev $zdev_enable [...] ${zdev[@]}"
|
|
+ chzdev $zdev_enable $zdev_base_args "${zdev[@]}"
|
|
+ fi
|
|
+done
|
|
+
|
|
--- /dev/null
|
|
+++ b/zdev/dracut/96zdev-live/write-udev-live.sh
|
|
@@ -0,0 +1,11 @@
|
|
+#!/bin/sh
|
|
+#
|
|
+# 96zdev-live/write-udev-live.sh
|
|
+# Copy udeve rules generated by chzdev for device activation starting with 41
|
|
+# to a *writable* /sysroot -- this is primarily useful for live/installation-
|
|
+# type media (and by default only active on no-hostonly initrds)
|
|
+#
|
|
+
|
|
+if [ -w /sysroot/etc/udev/rules.d ]; then
|
|
+ cp -p /etc/udev/rules.d/41-* /sysroot/etc/udev/rules.d
|
|
+fi
|
|
--- a/zdev/dracut/Makefile
|
|
+++ b/zdev/dracut/Makefile
|
|
@@ -3,17 +3,23 @@
|
|
|
|
ZDEVDIR := 95zdev
|
|
ZDEVKDUMPDIR := 95zdev-kdump
|
|
+ZDEVLIVEDIR := 96zdev-live
|
|
|
|
# HAVE_DRACUT
|
|
#
|
|
-# This install time parameter determines whether the zdev dracut module is
|
|
-# installed (HAVE_DRACUT=1) or not (default). When installed, the module
|
|
+# This install time parameter determines whether the zdev dracut modules are
|
|
+# installed (HAVE_DRACUT=1) or not (default). When installed, the 95zdev module
|
|
# performs the following functions when dracut is run:
|
|
#
|
|
# - copy the persistent root device configuration to the initial ram disk
|
|
# - install a boot-time hook to apply firmware-provided configuration data
|
|
# to the system
|
|
#
|
|
+# The 96zdev-live module performs the following functions when dracut is run:
|
|
+#
|
|
+# - install a boot-time hook to apply command-line-provided configuration data
|
|
+# to a no-hostonly built initial ram disk for use in live/installation media
|
|
+#
|
|
ifeq ($(HAVE_DRACUT),1)
|
|
install:
|
|
$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/
|
|
@@ -29,4 +35,9 @@
|
|
$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVKDUMPDIR)
|
|
$(INSTALL) -m 755 $(ZDEVKDUMPDIR)/module-setup.sh \
|
|
$(DESTDIR)$(DRACUTMODDIR)/$(ZDEVKDUMPDIR)/
|
|
+ $(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVLIVEDIR)
|
|
+ $(INSTALL) -m 755 $(ZDEVLIVEDIR)/module-setup.sh \
|
|
+ $(ZDEVLIVEDIR)/parse-zdev-live.sh \
|
|
+ $(ZDEVLIVEDIR)/write-udev-live.sh \
|
|
+ $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVLIVEDIR)/
|
|
endif
|