Hello community, here is the log from the commit of package s390-tools for openSUSE:Factory checked in at 2017-10-13 14:03:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s390-tools (Old) and /work/SRC/openSUSE:Factory/.s390-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s390-tools" Fri Oct 13 14:03:14 2017 rev:8 rq:531962 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/s390-tools/s390-tools.changes 2017-09-12 19:39:37.608092549 +0200 +++ /work/SRC/openSUSE:Factory/.s390-tools.new/s390-tools.changes 2017-10-13 14:03:17.657982955 +0200 @@ -1,0 +2,178 @@ +Thu Oct 5 20:47:52 UTC 2017 - [email protected] + +- Modified mkdump perl script to work with the updated version + of the IBM tools dasdview, zipl and zgetdump. (bsc#1020336). + +------------------------------------------------------------------- +Wed Oct 4 19:45:29 UTC 2017 - [email protected] + +- Upgraded to version 2.1.0 (Fate#323291). + Changes from 2.0.0 to 2.1.0 + * Added the following tools: + netboot: Scripts for building a PXE-style netboot image for KVM + 90-cpi.rules/cpictl: New udev rule to update CPI when KVM is used + * Modified lsqeth/zdev to add VNIC Characteristics support + Bug fixes + * chzcrypt: Corrected handling of insufficient permissions + * cpacfstats: Add size setting to perf event + * fdasd: Skip partition check with the force option + * ttyrun: Fix deprecated BindTo usage in [email protected] + * lszcrypt: Fix core dump caused by stack overwrite + * lszcrypt: Fix random domain printout when no config available + * zdev: Fix segfault with unknown qeth attribute + * zdev: Fix IPv6 NDP proxy description + * zdev: Fix zdev dracut module temp file location + * zkey: Correctly detect abbreviated commands + * zkey: Validate XTS key: ignore domain and card + * zkey: Use octal values instead of S_IRWX* constants + * zkey: Properly set umask to prohibit permissions to group and others + * zkey: Add -ldl to LDLIBS (not LDFLAGS) + * znetconf: Re-add missing line in lsznet.raw + * Fix several gcc 7 warnings +- Modified s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl.patch + to apply cleanly to this version. +- Removed the following obsolete patches: + * s390-tools-sles15-zgetdump-Fix-gcc-7-warning.patch + * s390-tools-sles15-lscss-Get-rid-of-gcc-7-buffer-truncation-warnings.patch + * s390-tools-sles15-Get-rid-of-gcc-7-fall-through-warnings.patch + * s390-tools-sles15-lszcrypt-Fix-core-dump-caused-by-stack-overwrite.patch + * s390-tools-sles15-dasdinfo-Fix-GCC-7-overflow-warning.patch + +------------------------------------------------------------------- +Thu Sep 8 21:06:37 UTC 2017 - [email protected] + +- Added the following patches (bsc#1056498) + - s390-tools-sles15-zgetdump-Fix-gcc-7-warning.patch + - s390-tools-sles15-lscss-Get-rid-of-gcc-7-buffer-truncation-warnings.patch + - s390-tools-sles15-Get-rid-of-gcc-7-fall-through-warnings.patch + - s390-tools-sles15-lszcrypt-Fix-core-dump-caused-by-stack-overwrite.patch + - s390-tools-sles15-dasdinfo-Fix-GCC-7-overflow-warning.patch + +------------------------------------------------------------------- +Tue Sep 8 20:01:35 UTC 2017 - [email protected] + +- Upgraded to version 2.0.0 (Fate#323291). + - Changes from 1.34.0 to 1.35.0 + - cpuplugd: Make default config file location more distribution agnostic + Add systemd service unit to start/stop the cpuplug daemon + Add force-reload action to init script for LSB-compliance + - mon_statd: Add force-reload action to init script for LSB-compliance + - chiucvallow: corrected verification return code + - lczdev/chzdev: Add support for resolving iSCSI block devices + Bug fixes + - chzdev, lszdev: Fix incorrect zfcp module parameter name + - chreipl: Fix chreipl node for virtio devices + - libus2s: Fix busid parsing + - zipl/boot: Fix failed start subchannel in FBA loader + - Changes from 1.35.0 to 1.36.0 + - chzdev/lszdev: Add device resolution for vlan and bonding devices + - dasdfmt: Add quick format support + - lsdasd/fdasd/dasdfmt/zdsfs: Add query host access to volume support + - zfcpdbf: Make timestamp the first field in record output + Exclude Payload hex field from log message record output + Add Area field to record output + Add missing header fields to area record output + Print the Record id field for Area area class records + Mark oldest and newest trace area records + Mark oldest and newest def_err pseudo area records + Mark oldest and newest foreign area records + Mark oldest and newest log message records + Add a warning about low resolution timestamps + Add Trace Area Statistics table to script output + Add time zone command line option + Add collection of domain xml files + Bug fixes + - zfcpdbf: Move and fix CPU id field output to print_header function + Include microseconds in warning threshold calculation + Fix parsing of precise syslog timestamps + Fix labels for REC ERP action status and ERP step fields + - Changes from 1.36.0 to 1.36.1 + - zfcpdbf: Support basic HBA record type without warning + Restore tracing of handle for port and LUN with HBA records + Print full payload for all SAN traces (req, resp, iels) + Print payload length everywhere applicable + Disambiguate printing of payload record content + Bug fixes + - fdasd: Prevent buffer overflow + - znetconf: Fix detection of chpids as OSX instead of OSM + - Changes from 1.36.1 to 1.37.0 + - Added dump2tar: sysfs collection helper for dbginfo.sh + - qethconf: Remove check for OSN-device + - znetconf: Remove OSN-support + - lsdasd/tunedasd: Add channel path aware erp + - zcrypt: Add multi domain support for zcrypt device driver + - scm: Reimplement lsscm in C + - chp: Reimplement chchp and lschp in C + - dbginfo.sh: Make use of sysinfo collection helper + Bug fixes + - zfcpdbf: Only cap SAN short payload if pl_len exists + - chzdev: Fix bug when configuring QETH devices + - libu2s: Prevent buffer overflow + - ziomon: No blktrace kill which can corrupt kernel blktrace state + - Changes from 1.37.0 to 1.37.1 + - dbginfo.sh: Add Docker debug data + Bug fixes + - lsdasd: Replace continue with return + - lscss: Allow to specify devices from subchannel set 3 + - mon_fsstatd: Only use physical filesystems + Fix double free in error path + - mon_procd: Fix segmentation fault + - Changes from 1.37.1 to 1.38.0 + - systemd: Add new units for cpi, dumpconf, mon_fsstatd, and mon_procd + - fdasd: Add new command action 'l' to list known partition types + - chmem: Try to online memory to zone movable + Starting with kernel 4.13 (commit f1dd2cd1), the default zone for + hotplug memory is changed from zone movable to zone normal. In order + to preserve the previous default behaviour, chmem will now always try + to set memory online to the zone movable, before trying to set it + online to the default zone. + - zfcpdbf: Print high part of "new" 64 bit SCSI LUN + Print payload with full FCP_RSP IU in SCSI trace records + - util_opt: Add command specific command line parsing + - util_rec: Implement util_rec_iterate() function + - util_rec: Record field values can be stored and processed in argz format + Bug fixes + - zipl/zgetdump: Add missing SCSI multipath dump information to man pages + - lsqeth: Fix attributes name: ipa -> ipa_takeover and parp -> rxip + Fix lsqeth output of ipa/vipa/rxip addresses of interfaces + - zfcpdbf: Fix payload length for zfcp_dbf_hba_bit_err + - chzdev: Add implicit qeth layer settings handling + - qethqoat: Fix OSA 6S detection + - Changes from 1.38.0 to 2.0.0 (also known as 1.39.0) + - IBM changed the license to MIT. + - Added zkey: Generate, re-encipher, and validate secure AES keys + - cpumf: Add hardware counters for z13 and z13s + - lscss: Reimplement lscss script in C + - lsqeth: Reimplement lsqeth script in C + Bug fixes + - lscpumf: Fix Perl warnings + - Removed the following obsolete patches: + s390-tools-sles12sp2-chiucvallow-verify.patch + s390-tools-sles12sp2-chreipl-virtio.patch + s390-tools-sles12sp2-chzdev-disable-root-update.patch + s390-tools-sles12sp2-feat-01-dasd-query-host.patch + s390-tools-sles12sp2-lscss-allow-to-specify-devices-from-ssid-3.patch + s390-tools-sles12sp2-zipl-fix-failed-start-subchannel.patch + s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch + s390-tools-sles12sp3-dasdfmt-01-Fix-behaviour-of-t-combined-with-y.patch + s390-tools-sles12sp3-dasdfmt-02-Fix-trailing-whitespace.patch + s390-tools-sles12sp3-dasdfmt-03-Apply-coding-convention.patch + s390-tools-sles12sp3-dasdfmt-04-Use-enhanced-DASD-information.patch + s390-tools-sles12sp3-dasdfmt-05-Refactor-do_format_dasd.patch + s390-tools-sles12sp3-dasdfmt-06-Make-the-IOCTL-BLKSSZGET-reusable.patch + s390-tools-sles12sp3-dasdfmt-07-Add-quick-format-support.patch + s390-tools-sles12sp3-dasdfmt-08-Make-progress-output-reusable-and-add-ETR.patch + s390-tools-sles12sp3-dasdfmt-09-Add-command-line-argument-check.patch + s390-tools-sles12sp3-dasdfmt-10-Add-expand-format-mode.patch + s390-tools-sles12sp3-dbginfo-01-libutil-Add-utility-functions.patch + s390-tools-sles12sp3-dbginfo-02-dump2tar-Add-sysfs-collection-helper-for-dbginfo.sh-v2.patch + s390-tools-sles12sp3-dbginfo-03-dbginfo.sh-Make-use-of-sysinfo-collection-helper.patch + s390-tools-sles12sp3-dbginfo-Collect-docker-debug-data.patch + s390-tools-sles12sp2-libu2s-Fix-busid-parsing.patch + s390-tools-sles12sp3-lsdasd-tunedasd-Add-channel-path-aware-erp.patch + s390-tools-sles12sp3-mon_fsstatd-fix-double-free-in-error-path-and-skip-virtual-fs.patch + s390-tools-sles12sp3-util_proc-fix-memory-allocation-error-messages.patch + s390-tools-sles12sp3-ziomon-no-blktrace-kill-which-can-corrupt-kernel-blk.patch +- Added s390-tools-sles15-add--ldl-to-LDLIBS.patch to fix a problem with zkey/Makefile. + +------------------------------------------------------------------- Old: ---- boot.cpi s390-tools-1.34.0.tar.bz2 s390-tools-sles12sp2-chiucvallow-verify.patch s390-tools-sles12sp2-chreipl-virtio.patch s390-tools-sles12sp2-chzdev-disable-root-update.patch s390-tools-sles12sp2-feat-01-dasd-query-host.patch s390-tools-sles12sp2-libu2s-Fix-busid-parsing.patch s390-tools-sles12sp2-lscss-allow-to-specify-devices-from-ssid-3.patch s390-tools-sles12sp2-zipl-fix-failed-start-subchannel.patch s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch s390-tools-sles12sp3-dasdfmt-01-Fix-behaviour-of-t-combined-with-y.patch s390-tools-sles12sp3-dasdfmt-02-Fix-trailing-whitespace.patch s390-tools-sles12sp3-dasdfmt-03-Apply-coding-convention.patch s390-tools-sles12sp3-dasdfmt-04-Use-enhanced-DASD-information.patch s390-tools-sles12sp3-dasdfmt-05-Refactor-do_format_dasd.patch s390-tools-sles12sp3-dasdfmt-06-Make-the-IOCTL-BLKSSZGET-reusable.patch s390-tools-sles12sp3-dasdfmt-07-Add-quick-format-support.patch s390-tools-sles12sp3-dasdfmt-08-Make-progress-output-reusable-and-add-ETR.patch s390-tools-sles12sp3-dasdfmt-09-Add-command-line-argument-check.patch s390-tools-sles12sp3-dasdfmt-10-Add-expand-format-mode.patch s390-tools-sles12sp3-dbginfo-01-libutil-Add-utility-functions.patch s390-tools-sles12sp3-dbginfo-02-dump2tar-Add-sysfs-collection-helper-for-dbginfo.sh-v2.patch s390-tools-sles12sp3-dbginfo-03-dbginfo.sh-Make-use-of-sysinfo-collection-helper.patch s390-tools-sles12sp3-dbginfo-Collect-docker-debug-data.patch s390-tools-sles12sp3-lsdasd-tunedasd-Add-channel-path-aware-erp.patch s390-tools-sles12sp3-mon_fsstatd-fix-double-free-in-error-path-and-skip-virtual-fs.patch s390-tools-sles12sp3-util_proc-fix-memory-allocation-error-messages.patch s390-tools-sles12sp3-ziomon-no-blktrace-kill-which-can-corrupt-kernel-blk.patch sysconfig.cpi New: ---- s390-tools-2.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools.spec ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:18.769934054 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:18.773933878 +0200 @@ -17,11 +17,11 @@ Name: s390-tools -Version: 1.34.0 +Version: 2.1.0 Release: 0 -Url: https://www.ibm.com/developerworks/linux/linux390/ +Url: https://github.com/ibm-s390-tools/s390-tools Summary: S/390 tools like zipl and dasdfmt -License: GPL-2.0+ and BSD-2-Clause +License: MIT Group: System/Kernel BuildRequires: dracut BuildRequires: fuse-devel @@ -46,7 +46,7 @@ Provides: s390utils:/sbin/dasdfmt # Don't build with pie to avoid problems with zipl #!BuildIgnore: gcc-PIE -Source: s390-tools-%{version}.tar.bz2 +Source: s390-tools-%{version}.tar.gz Source1: s390-tools-rpmlintrc Source2: zipl.conf Source3: hsnc @@ -62,8 +62,6 @@ Source13: sysconfig.osasnmpd Source14: zfcp_san_disc Source15: mkdump.8 -Source16: boot.cpi -Source17: sysconfig.cpi Source18: zpxe.rexx Source19: rules.xpram Source20: rules.hw_random @@ -106,36 +104,10 @@ Patch2: s390-tools-sles12-sysconfig-compatible-dumpconf.patch Patch3: s390-tools-sles12-create-filesystem-links.patch Patch4: s390-tools-sles12-update-by_id-links-on-change-and-add-action.patch -Patch5: s390-tools-sles12sp2-feat-01-dasd-query-host.patch -Patch6: s390-tools-sles12-pardasdfmt.patch -Patch7: dasdfmt-retry-BIODASDINFO-if-device-is-busy.patch -Patch8: 59-dasd.rules-wait_for.patch -Patch9: s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl.patch -Patch10: s390-tools-sles12sp2-libu2s-Fix-busid-parsing.patch -Patch11: s390-tools-sles12sp2-chiucvallow-verify.patch -Patch12: s390-tools-sles12sp2-zipl-fix-failed-start-subchannel.patch -Patch13: s390-tools-sles12sp2-chreipl-virtio.patch -Patch14: s390-tools-sles12sp2-chzdev-disable-root-update.patch -Patch15: s390-tools-sles12sp2-lscss-allow-to-specify-devices-from-ssid-3.patch -Patch16: s390-tools-sles12sp3-dbginfo-01-libutil-Add-utility-functions.patch -Patch17: s390-tools-sles12sp3-dbginfo-02-dump2tar-Add-sysfs-collection-helper-for-dbginfo.sh-v2.patch -Patch18: s390-tools-sles12sp3-dbginfo-03-dbginfo.sh-Make-use-of-sysinfo-collection-helper.patch -Patch19: s390-tools-sles12sp3-lsdasd-tunedasd-Add-channel-path-aware-erp.patch -Patch20: s390-tools-sles12sp3-dasdfmt-01-Fix-behaviour-of-t-combined-with-y.patch -Patch21: s390-tools-sles12sp3-dasdfmt-02-Fix-trailing-whitespace.patch -Patch22: s390-tools-sles12sp3-dasdfmt-03-Apply-coding-convention.patch -Patch23: s390-tools-sles12sp3-dasdfmt-04-Use-enhanced-DASD-information.patch -Patch24: s390-tools-sles12sp3-dasdfmt-05-Refactor-do_format_dasd.patch -Patch25: s390-tools-sles12sp3-dasdfmt-06-Make-the-IOCTL-BLKSSZGET-reusable.patch -Patch26: s390-tools-sles12sp3-dasdfmt-07-Add-quick-format-support.patch -Patch27: s390-tools-sles12sp3-dasdfmt-08-Make-progress-output-reusable-and-add-ETR.patch -Patch28: s390-tools-sles12sp3-dasdfmt-09-Add-command-line-argument-check.patch -Patch29: s390-tools-sles12sp3-dasdfmt-10-Add-expand-format-mode.patch -Patch30: s390-tools-sles12sp3-util_proc-fix-memory-allocation-error-messages.patch -Patch31: s390-tools-sles12sp3-mon_fsstatd-fix-double-free-in-error-path-and-skip-virtual-fs.patch -Patch32: s390-tools-sles12sp3-dbginfo-Collect-docker-debug-data.patch -Patch33: s390-tools-sles12sp3-ziomon-no-blktrace-kill-which-can-corrupt-kernel-blk.patch -Patch34: s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch +Patch5: s390-tools-sles12-pardasdfmt.patch +Patch6: dasdfmt-retry-BIODASDINFO-if-device-is-busy.patch +Patch7: 59-dasd.rules-wait_for.patch +Patch8: s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 s390x @@ -196,36 +168,10 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 +#patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 cp -vi %{S:22} CAUTION @@ -253,15 +199,15 @@ export ROOT_BUILD_DIR="$RPM_BUILD_DIR/%{name}-%{version}/zfcpdump/kernel" install -D -m600 /boot/image-*-zfcpdump $RPM_BUILD_ROOT/usr/lib/s390-tools/zfcpdump/zfcpdump_part.image -install -D -m644 etc/sysconfig/dumpconf $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dumpconf -install -D -m755 etc/init.d/dumpconf $RPM_BUILD_ROOT/etc/init.d/dumpconf install -D -m644 etc/udev/rules.d/40-z90crypt.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/40-z90crypt.rules -install -D -m644 etc/udev/rules.d/59-dasd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/59-dasd.rules install -D -m644 etc/udev/rules.d/57-osasnmpd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/57-osasnmpd.rules +install -D -m644 etc/udev/rules.d/59-dasd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/59-dasd.rules +install -D -m644 etc/udev/rules.d/90-cpi.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/90-cpi.rules +install -D -m644 etc/sysconfig/cpi $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cpi +install -D -m644 etc/sysconfig/dumpconf $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dumpconf +install -D -m644 etc/sysconfig/mon_fsstatd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mon_fsstatd +install -D -m644 etc/sysconfig/mon_procd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mon_procd install -D -m644 etc/sysconfig/mon_statd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mon_statd -install -D -m755 etc/init.d/mon_statd $RPM_BUILD_ROOT/etc/init.d/mon_statd -install -D -m644 etc/sysconfig/cpuplugd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cpuplugd -install -D -m755 etc/init.d/cpuplugd $RPM_BUILD_ROOT/etc/init.d/cpuplugd mv iucvterm/doc/ts-shell/iucvconn_on_login $RPM_BUILD_ROOT/usr/bin/iucvconn_on_login install -D -m644 %{S:26} $RPM_BUILD_ROOT/%{_unitdir}/cio_ignore.service install -D -m755 %{S:27} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/setup_cio_ignore.sh @@ -287,8 +233,6 @@ install -D -m644 %{S:13} var/adm/fillup-templates/sysconfig.osasnmpd install -D -m755 %{S:14} sbin/zfcp_san_disc install -D -m644 %{S:15} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -D -m755 %{S:16} etc/init.d/boot.cpi -install -D -m644 %{S:17} var/adm/fillup-templates/sysconfig.cpi install -D -m644 %{S:19} $RPM_BUILD_ROOT/usr/lib/udev/rules.d/52-xpram.rules install -D -m644 %{S:20} $RPM_BUILD_ROOT/usr/lib/udev/rules.d/52-hw_random.rules install -D -m644 %{S:21} $RPM_BUILD_ROOT/usr/lib/udev/rules.d/59-graf.rules @@ -304,14 +248,16 @@ mkdir -p %{_sbindir} fi (cd usr/sbin; ln -s ../../etc/init.d/appldata rcappldata) -(cd usr/sbin; ln -s ../../etc/init.d/cpuplugd rccpuplugd) -(cd usr/sbin; ln -s ../../etc/init.d/dumpconf rcdumpconf) (cd usr/sbin; ln -s ../../etc/init.d/hsnc rchsnc) -(cd usr/sbin; ln -s ../../etc/init.d/mon_statd rcmon_statd) (cd usr/sbin; ln -s ../../etc/init.d/vmlogrdr rcvmlogrdr) (cd usr/sbin; ln -s ../../etc/init.d/xpram rcxpram) (cd usr/sbin; ln -s service rccio_ignore) (cd usr/sbin; ln -s service rccpacfstatsd) +(cd usr/sbin; ln -s service rccpi) +(cd usr/sbin; ln -s service rccpuplugd) +(cd usr/sbin; ln -s service rcdumpconf) +(cd usr/sbin; ln -s service rcmon_fsstatd) +(cd usr/sbin; ln -s service rcmon_procd) (cd usr/sbin; ln -s service rcvirtsetup) if [ ! -d %{_bindir} ]; then @@ -364,6 +310,13 @@ getent group ts-shell >/dev/null 2>&1 || groupadd -r ts-shell %service_add_pre cio_ignore.service %service_add_pre cpacfstatsd.service +%service_add_pre cpi.service +%service_add_pre cpuplugd.service +%service_add_pre dumpconf.service +%service_add_pre [email protected] +%service_add_pre mon_fsstatd.service +%service_add_pre mon_procd.service +%service_add_pre [email protected] %service_add_pre virtsetup.service %post @@ -378,17 +331,25 @@ # Create symbolic links to the scripts from setup and boot directories %service_add_post cio_ignore.service %service_add_post cpacfstatsd.service +%service_add_post cpi.service +%service_add_post cpuplugd.service +%service_add_post dumpconf.service +%service_add_post [email protected] +%service_add_post mon_fsstatd.service +%service_add_post mon_procd.service +%service_add_post [email protected] %service_add_post virtsetup.service + # -i: skip insserv parts - has to be configured before use: %{fillup_and_insserv -i -n appldata} -%{fillup_and_insserv -i -n cpuplugd} +%{fillup_and_insserv -i -n cpi} %{fillup_and_insserv -i -n dumpconf} %{fillup_and_insserv -i -n hsnc} +%{fillup_and_insserv -i -n mon_fsstatd} +%{fillup_and_insserv -i -n mon_procd} %{fillup_and_insserv -i -n mon_statd} -%{fillup_and_insserv -i -n vmlogrdr} %{fillup_and_insserv -i -n virtsetup} %{fillup_and_insserv -i -n xpram} -%{fillup_and_insserv -y -n cpi boot.cpi} %triggerin -- kernel-default grep -q '^/usr/bin/ts-shell$' /etc/shells \ @@ -399,28 +360,35 @@ %preun %{stop_on_removal appldata} -%{stop_on_removal cpuplugd} -%{stop_on_removal dumpconf} %{stop_on_removal hsnc} -%{stop_on_removal mon_statd} %{stop_on_removal vmlogrdr} %{stop_on_removal xpram} %service_del_preun cio_ignore.service %service_del_preun cpacfstatsd.service +%service_del_preun cpi.service +%service_del_preun cpuplugd.service +%service_del_preun dumpconf.service +%service_del_preun [email protected] +%service_del_preun mon_fsstatd.service +%service_del_preun mon_procd.service %service_del_preun virtsetup.service %postun -%{restart_on_update boot.cpi} %{restart_on_update appldata} -%{restart_on_update cpuplugd} -%{restart_on_update dumpconf} %{restart_on_update hsnc} -%{restart_on_update mon_statd} %{restart_on_update vmlogrdr} %{restart_on_update xpram} %service_del_postun cio_ignore.service %service_del_postun cpacfstatsd.service +%service_del_postun cpi.service +%service_del_postun cpuplugd.service +%service_del_postun dumpconf.service +%service_del_postun [email protected] +%service_del_postun mon_fsstatd.service +%service_del_postun mon_procd.service +%service_del_postun [email protected] %service_del_postun virtsetup.service + read INITPGM < /proc/1/comm if [ "${INITPGM}" == "systemd" ]; then echo "Running systemctl daemon-reload." @@ -447,7 +415,7 @@ %files -f %{_builddir}/%{name}.list %defattr(-,root,root) -%doc README +%doc README.md %doc README.SUSE %doc iucvterm/doc/ts-shell @@ -470,6 +438,7 @@ %dir %{_unitdir} %dir /usr/share/s390-tools %dir /usr/share/s390-tools/cpumf +%dir /usr/share/s390-tools/netboot %dir /boot/zipl %dir /lib/s390-tools/ %exclude /usr/lib/udev/rules.d/57-osasnmpd.rules ++++++ 59-dasd.rules-wait_for.patch ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:18.829931415 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:18.829931415 +0200 @@ -8,7 +8,7 @@ -# on device add set request queue scheduler to deadline -SUBSYSTEM!="block", GOTO="sched_end" - --ACTION!="add", GOTO="sched_end" --KERNEL=="dasd*[!0-9]", WAIT_FOR="queue/scheduler", ATTR{queue/scheduler}="deadline" +-ACTION!="change", GOTO="sched_end" +-KERNEL=="dasd*[!0-9]", TEST=="queue/scheduler", ATTR{queue/scheduler}="deadline" - -LABEL="sched_end" ++++++ dasdfmt-retry-BIODASDINFO-if-device-is-busy.patch ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:19.017923147 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:19.021922971 +0200 @@ -23,49 +23,44 @@ index e1877ac..f03cbad 100644 --- a/dasdfmt/dasdfmt.c +++ b/dasdfmt/dasdfmt.c -@@ -270,7 +270,7 @@ static void init_info(dasdfmt_info_t *info) +@@ -588,7 +616,7 @@ + */ static void check_disk(dasdfmt_info_t *info) { - dasd_information_t dasd_info; - int ro, errno_save; + int ro, errno_save, i = 0; if (ioctl(filedes, BLKROGET, &ro) != 0) { errno_save = errno; -@@ -283,7 +283,7 @@ static void check_disk(dasdfmt_info_t *info) - if (ro) { +@@ -602,9 +630,27 @@ + if (ro) ERRMSG_EXIT(EXIT_FAILURE, "Disk is read only!\n"); - } -- -+retry: - if (ioctl(filedes, BIODASDINFO, &dasd_info) != 0) { - errno_save = errno; - close(filedes); -@@ -294,8 +294,23 @@ static void check_disk(dasdfmt_info_t *info) - } - if (!info->force) -- if (dasd_info.open_count > 1) +- if (!info->force) ++ if (!info->force) { + /* + * udev strikes again. + * Modern udev will issue a 'change' event whenever + * a device opened with O_RDWR is closed again. -+ * On the ground that program _might_ have changed ++ * On the grounds that program _might_ have changed + * the partition table. + * And confusing the hell out ouf anyone else. + * Bah. -+ */ -+ if (dasd_info.open_count > 1) { -+ if (i < 5) { -+ ++i; ++ */ ++ for ( i = 0 ; i < 6 ; i++ ) { ++ if (info->dasd_info.open_count > 1) { ++ get_device_info(info); + sleep(1); -+ goto retry; + } - ERRMSG_EXIT(EXIT_BUSY, "Disk in use!\n"); ++ else break; ++ + } + if (info->dasd_info.open_count > 1) + ERRMSG_EXIT(EXIT_BUSY, "Disk in use!\n"); ++ } - info->usage_count = dasd_info.open_count; - info->devno = dasd_info.devno; + if (strncmp(info->dasd_info.type, "ECKD", 4) != 0) { + ERRMSG_EXIT(EXIT_FAILURE, -- 1.8.4.5 ++++++ mkdump.8 ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:19.113918926 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:19.113918926 +0200 @@ -6,7 +6,7 @@ .B mkdump [\fIOPTIONS\fR] [\fIDEVICE\fR]... .SH DESCRIPTION -mkdump 2.0.2 +mkdump 2.0.3 .PP Prepare one or more volumes for use as S/390 dump device. Supported devices are ECKD DASD and SCSI over zFCP disks, while multi\-volumes are limited to DASD. ++++++ mkdump.pl ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:19.133918046 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:19.137917870 +0200 @@ -4,7 +4,8 @@ # mkdump.pl - Preparing disks for use as S/390 dump device # # Copyright (c) 2011 Tim Hardeck, SUSE LINUX Products GmbH -# bases on mkdump.sh (c) 2004 Hannes Reinecke, SuSE AG +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Based on mkdump.sh (c) 2004 Hannes Reinecke, SuSE AG # # License: # @@ -30,7 +31,7 @@ use Fcntl; use Getopt::Long; -my $VERSION = "2.0.2"; +my $VERSION = "2.0.3"; my $BLKID = "/sbin/blkid"; my $PARTED = "/usr/sbin/parted"; @@ -41,7 +42,6 @@ my $UDEVADM = "/sbin/udevadm"; my $ZGETDUMP = "/sbin/zgetdump"; -my $MNTPOINT = "/var/run/mkdump." . getppid(); # temporary DASD device configuration file for Zipl my $MDPATH = "/tmp/mvdump.conf"; # zFCP dump dir, without a leading '/' @@ -57,11 +57,6 @@ if (-e $MDPATH) { system("rm -f $MDPATH"); } - # zFCP - if (-d $MNTPOINT) { - system("umount $MNTPOINT"); - system("rmdir $MNTPOINT"); - } } sub exit_with @@ -230,15 +225,10 @@ $output .= "\t$adapter\t$wwpn\t$lun"; # check for dump record - system("mkdir -p $MNTPOINT"); - if (get_partition_num($device) == 1 and system("mount -o ro ${device}1 $MNTPOINT 2>/dev/null") == 0) { - if ( -r "$MNTPOINT/bootmap" and -d "$MNTPOINT/$ZFCP_DUMP_DIR") { - $dump_device = 1; - $output .= "\tdumpdevice"; - } - system("umount $MNTPOINT"); + if (system("$ZGETDUMP -d ${device} >/dev/null 2>&1") == 0) { + $dump_device = 1; + $output .= "\tdumpdevice"; } - system("rmdir $MNTPOINT"); } if ($only_dump_disks) { if ($dump_device) { @@ -324,7 +314,7 @@ # check formatting for my $device (@devices) { # determine disk layout - my ($fmtstr) = `$DASDVIEW -x -f $device` =~ /(\w\w\w) formatted/; + my ($fmtstr) = `$DASDVIEW -x $device` =~ /(\w\w\w) formatted/; SWITCH: for($fmtstr) { ++++++ s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl.patch ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:19.229913825 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:19.229913825 +0200 @@ -19,27 +19,9 @@ index 4503d3e..f04dc3d 100644 --- a/fdasd/fdasd.c +++ b/fdasd/fdasd.c -@@ -826,7 +826,7 @@ fdasd_check_conffile_input (fdasd_anchor_t *anc, - * Verifies the specified block device. - */ - static void --fdasd_verify_device (fdasd_anchor_t *anc, char *name) -+fdasd_verify_device (fdasd_anchor_t *anc, char *name) - { - struct stat dst; - char err_str[ERROR_STRING_SIZE]; -@@ -847,7 +847,7 @@ fdasd_verify_device (fdasd_anchor_t *anc, char *name) - fdasd_error(anc, device_verification_failed, err_str); +@@ -1247,9 +1247,12 @@ } -- if (minor (dst.st_rdev) & PARTN_MASK) { -+ if (!anc->force_virtual && minor (dst.st_rdev) & PARTN_MASK) { - snprintf(err_str, ERROR_STRING_SIZE, - "Partition '%s' (%d/%d) detected where device is " - "required\n", name, -@@ -1156,9 +1156,12 @@ fdasd_reread_partition_table (fdasd_anchor_t *anc) - } - if (ioctl(fd, BLKRRPART, NULL) != 0) { - close(fd); - fdasd_error(anc, unable_to_ioctl, "Error while rereading " @@ -52,6 +34,4 @@ + } } close(fd); - } --- -1.8.5.2 + } ++++++ s390-tools-sles12-pardasdfmt.patch ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:19.241913297 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:19.241913297 +0200 @@ -10,12 +10,12 @@ - [-r \fIcylinder\fR] [-b \fIblksize\fR] [-l \fIvolser\fR] [-d \fIlayout\fR] + [-r \fIcylinder\fR] [-b \fIblksize\fR] [-l \fIvolser\fR] [-d \fIlayout\fR] [-P maxpar] .br -- [-L] [-V] [-F] [-k] [-C] \fIdevice\fR -+ [-L] [-V] [-F] [-k] [-C] \fIdevice\fR ... +- [-L] [-V] [-F] [-k] [-C] [-M \fImode\fR] \fIdevice\fR ++ [-L] [-V] [-F] [-k] [-C] [-M \fImode\fR] \fIdevice\fR ... .SH DESCRIPTION \fBdasdfmt\fR formats a DASD (ECKD) disk drive to prepare it -@@ -91,7 +91,7 @@ +@@ -95,7 +95,7 @@ running in background or redirecting the output to a file. .TP @@ -24,7 +24,7 @@ Print one line for each formatted cylinder showing the number of the cylinder and percentage of formatting process. Intended to be used by higher level interfaces. -@@ -123,6 +123,20 @@ +@@ -152,6 +152,20 @@ and always be a power of two. The recommended blocksize is 4096 bytes. .TP @@ -47,7 +47,7 @@ to disk after formatting. If no label is specified, a sensible default --- s390-tools-1.34.0/dasdfmt/dasdfmt.h 2016-04-14 16:43:51.000000000 -0400 +++ s390-tools-1.34.0/dasdfmt/dasdfmt.h 2016-04-14 16:35:01.000000000 -0400 -@@ -195,6 +195,7 @@ +@@ -260,6 +260,7 @@ #define LABEL_LENGTH 14 #define VLABEL_CHARS 84 #define LINE_LENGTH 80 ++++++ s390-tools-sles12-zipl_boot_msg.patch ++++++ --- /var/tmp/diff_new_pack.RpJrYz/_old 2017-10-13 14:03:19.261912418 +0200 +++ /var/tmp/diff_new_pack.RpJrYz/_new 2017-10-13 14:03:19.265912242 +0200 @@ -1,13 +1,16 @@ --- s390-tools-1.24.1/zipl/boot/menu.c 2013-12-18 11:11:45.000000000 -0500 +++ s390-tools-1.24.1/zipl/boot/menu.c 2013-12-18 11:59:18.000000000 -0500 -@@ -166,7 +166,9 @@ +@@ -167,8 +167,11 @@ + /* print config list */ menu_list(); - if (is_zvm()) +- if (is_zvm()) - printf("Note: VM users please use '#cp vi vmsg <input>'\n"); ++ if (is_zvm()) { + printf(" \n"); + printf("Note: VM users please use '#cp vi vmsg <input> <kernel-parameters>'\n"); + printf(" \n"); ++ } value = menu_read();
