Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2020-03-17 13:05:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Tue Mar 17 13:05:52 2020 rev:153 rq:784046 version:049.1+git135.46dceb02 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2020-03-06 21:24:06.737443287 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new.3160/dracut.changes 2020-03-17 13:05:55.941604870 +0100 @@ -1,0 +2,21 @@ +Wed Mar 11 18:50:53 UTC 2020 - [email protected] + +- Update to version 049.1+git135.46dceb02: + * 40network: Do not require hostname binary + * suse.spec: add new modules 90nvdimm and 99suse-initrd + * 95fcoe: default rd.nofcoe to false (bsc#1163343) + * Add module "99suse-initrd" for parsing "SUSE INITRD" lines (bsc#1161343) + Dependent commits: + * Add module "90nvdimm" for NVDIMM support + * 90kernel-modules: remove nfit from static module list + +------------------------------------------------------------------- +Tue Mar 10 16:23:56 UTC 2020 - [email protected] + +- Update to version 049.1+git129.0f19bbfd: + * 35network-legacy: dhclient is optional (bsc#1166188) + * suse.spec: Create -extra package (bsc#1166188) + * suse.spec: Remove obsolete permission fixups + * 00warpclock: Fix permissions in warpclock.sh + +------------------------------------------------------------------- Old: ---- dracut-049.1+git125.e2b2c9ef.obscpio dracut-049.1+git125.e2b2c9ef.tar.xz New: ---- dracut-049.1+git135.46dceb02.obscpio dracut-049.1+git135.46dceb02.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.Z8APvy/_old 2020-03-17 13:05:56.821605545 +0100 +++ /var/tmp/diff_new_pack.Z8APvy/_new 2020-03-17 13:05:56.821605545 +0100 @@ -19,7 +19,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: dracut -Version: 049.1+git125.e2b2c9ef +Version: 049.1+git135.46dceb02 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -104,6 +104,17 @@ %description tools This package contains tools to assemble the local initrd and host configuration. +%package extra +Summary: Dracut modules usually not required for normal operation +Group: System/Base +Requires: %{name} = %{version}-%{release} +Requires: evmctl +Requires: keyutils + +%description extra +This package contains all modules that are part of dracut upstream +but are not normally supported or required. + %prep %setup -q @@ -119,21 +130,6 @@ echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh -# use systemd-analyze instead, does not need dracut support -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00bootchart - -# not supported -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox - -# Remove RH-specific s390 modules -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95dasd -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95zfcp -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95znet - -# remove gentoo specific modules -rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash - mkdir -p %{buildroot}/boot/dracut mkdir -p %{buildroot}%{_localstatedir}/lib/dracut/overlay mkdir -p %{buildroot}%{_localstatedir}/log @@ -239,6 +235,24 @@ %dir %{_localstatedir}/lib/dracut %dir %{_localstatedir}/lib/dracut/overlay +%files extra +%defattr(-,root,root,0755) +%license COPYING + +# Use systemd-analyze instead, does not need dracut support +%{dracutlibdir}/modules.d/00bootchart + +%{dracutlibdir}/modules.d/02caps +%{dracutlibdir}/modules.d/90stratis +%{dracutlibdir}/modules.d/00dash +%{dracutlibdir}/modules.d/05busybox +%{dracutlibdir}/modules.d/50gensplash + +# RH-specific s390 modules, we take another approach +%{dracutlibdir}/modules.d/95dasd +%{dracutlibdir}/modules.d/95zfcp +%{dracutlibdir}/modules.d/95znet + %files %defattr(-,root,root,0755) %license COPYING @@ -300,7 +314,6 @@ %{dracutlibdir}/modules.d/00systemd %{dracutlibdir}/modules.d/00warpclock %{dracutlibdir}/modules.d/01systemd-initrd -%{dracutlibdir}/modules.d/02caps %{dracutlibdir}/modules.d/02systemd-networkd %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue @@ -330,9 +343,9 @@ %{dracutlibdir}/modules.d/90lvm %{dracutlibdir}/modules.d/90mdraid %{dracutlibdir}/modules.d/90multipath +%{dracutlibdir}/modules.d/90nvdimm %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/90qemu-net -%{dracutlibdir}/modules.d/90stratis %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop %{dracutlibdir}/modules.d/91zipl @@ -369,24 +382,9 @@ %{dracutlibdir}/modules.d/99shutdown %{dracutlibdir}/modules.d/99squash %{dracutlibdir}/modules.d/99suse +%{dracutlibdir}/modules.d/99suse-initrd %{dracutlibdir}/modules.d/99uefi-lib -# executable fixups -%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/90livenet/livenet-generator.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/90multipath/multipath-shutdown.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/parse-dcssblk.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/module-setup.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/cleanup-fcoe.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/stop-fcoe.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/module-setup.sh - -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/sas_transport_scan_lun.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/parse-lunmask.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/fc_transport_scan_lun.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/module-setup.sh - %config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0640,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_unitdir}/initrd.target.wants ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Z8APvy/_old 2020-03-17 13:05:56.877605589 +0100 +++ /var/tmp/diff_new_pack.Z8APvy/_new 2020-03-17 13:05:56.881605592 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">e2b2c9ef43e696e6d3ea4fc88754247531f33b89</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">46dceb021076004a85a089ff1f886b8b3edb7924</param></service></servicedata> \ No newline at end of file ++++++ dracut-049.1+git125.e2b2c9ef.obscpio -> dracut-049.1+git135.46dceb02.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/ifup.sh new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/ifup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/ifup.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/ifup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -70,7 +70,7 @@ [ -n "${MTU}" ] && ip $1 link set mtu "$MTU" dev "$INTERFACE" # Setup hostname - [ -n "${HOSTNAME}" ] && hostname "$HOSTNAME" + [ -n "${HOSTNAME}" ] && echo $HOSTNAME > /proc/sys/kernel/hostname # If nameserver= has not been specified, use what dhcp provides if [ ! -s /tmp/net.$netif.resolv.conf.ipv${1:1:1} ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/module-setup.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -4,7 +4,7 @@ check() { local _program - require_binaries ip sed awk grep hostname || return 1 + require_binaries ip sed awk grep || return 1 require_any_binary arping arping2 wicked || return 1 require_any_binary dhclient wicked || return 1 @@ -24,13 +24,12 @@ # called by dracut install() { local _arch _i _dir - inst_multiple ip dhclient sed awk grep - + inst_multiple ip sed awk grep + inst_multiple -o dhclient inst_multiple -o arping arping2 strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2" inst_multiple -o wicked inst_multiple -o ping ping6 - inst_multiple -o hostname inst_multiple -o teamd teamdctl teamnl inst_simple /etc/libnl/classid inst_script "$moddir/ifup.sh" "/sbin/ifup" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/90kernel-modules/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/90kernel-modules/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/90kernel-modules/module-setup.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/90kernel-modules/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -42,7 +42,7 @@ yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \ atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus \ virtio virtio_blk virtio_ring virtio_pci virtio_scsi \ - "=drivers/pcmcia" =ide nvme vmd nfit + "=drivers/pcmcia" =ide nvme vmd if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]; then # arm/aarch64 specific modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/90nvdimm/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/90nvdimm/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/90nvdimm/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/90nvdimm/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -0,0 +1,31 @@ +#!/bin/bash + +# called by dracut +check() { + if [[ ! $hostonly ]]; then + return 0 + fi + [[ $DRACUT_KERNEL_MODALIASES && -f "$DRACUT_KERNEL_MODALIASES" ]] && \ + grep -q libnvdimm "$DRACUT_KERNEL_MODALIASES" && return 0 + return 255 +} + +# called by dracut +depends() { + return 0 +} + +# called by dracut +installkernel() { + # Directories to search for NVDIMM "providers" (firmware drivers) + # These modules call "nvdimm_bus_register()". + local _provider_dirs='=drivers/nvdimm =drivers/acpi =arch/powerpc' + + #instmods() will take care of hostonly + dracut_instmods -o -s nvdimm_bus_register $_provider_dirs +} + +# called by dracut +install() { + inst_multiple -o ndctl +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/lldpad.sh new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/lldpad.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/lldpad.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/lldpad.sh 2020-03-11 19:44:38.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/bash -if ! getargbool 0 rd.nofcoe ; then +if getargbool 0 rd.nofcoe ; then info "rd.nofcoe=0: skipping lldpad activation" exit 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/parse-fcoe.sh new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/parse-fcoe.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/parse-fcoe.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/parse-fcoe.sh 2020-03-11 19:44:38.000000000 +0100 @@ -13,7 +13,7 @@ # fcoe=eth0:nodcb:vn2vn # fcoe=4a:3f:4c:04:f8:d7:nodcb:fabric -if ! getargbool 0 rd.nofcoe ; then +if getargbool 0 rd.nofcoe ; then info "rd.nofcoe=0: skipping fcoe" return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/99suse-initrd/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/99suse-initrd/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/99suse-initrd/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/99suse-initrd/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -0,0 +1,41 @@ +#!/bin/bash + +# Parse SUSE kernel module dependencies +# +# Kernel modules using "request_module" function may not show up in modprobe +# To worka round this, add depedencies in the following form: +# # SUSE_INITRD: module_name REQUIRES module1 module2 ... +# to /etc/modprobe.d/*.conf + +# called by dracut +check() { + # Skip the module if no SUSE INITRD is used + grep -q "^# SUSE INITRD: " $(get_modprobe_conf_files) +} + +get_modprobe_conf_files() { + ls /etc/modprobe.d/*.conf /run/modules.d/*.conf /lib/modules.d/*.conf \ + 2>/dev/null + return 0 +} + +# called by dracut +installkernel() { + local line mod reqs all_mods= + + while read -r line; do + mod="${line##*SUSE INITRD: }" + mod="${mod%% REQUIRES*}" + reqs="${line##*REQUIRES }" + if [[ ! $hostonly ]] || grep -q "^$mod\$" "$DRACUT_KERNEL_MODALIASES" + then + all_mods="$all_mods $reqs" + fi + done <<< "$(grep -h "^# SUSE INITRD: " $(get_modprobe_conf_files))" + + # strip whitespace + all_mods="$(echo $all_mods)" + if [[ "$all_mods" ]]; then + dracut_instmods $all_mods + fi +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/suse/dracut.spec new/dracut-049.1+git135.46dceb02/suse/dracut.spec --- old/dracut-049.1+git125.e2b2c9ef/suse/dracut.spec 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/suse/dracut.spec 2020-03-11 19:44:38.000000000 +0100 @@ -104,6 +104,17 @@ %description tools This package contains tools to assemble the local initrd and host configuration. +%package extra +Summary: Dracut modules usually not required for normal operation +Group: System/Base +Requires: %{name} = %{version}-%{release} +Requires: evmctl +Requires: keyutils + +%description extra +This package contains all modules that are part of dracut upstream +but are not normally supported or required. + %prep %setup -q @@ -119,21 +130,6 @@ echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh -# use systemd-analyze instead, does not need dracut support -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00bootchart - -# not supported -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox - -# Remove RH-specific s390 modules -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95dasd -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95zfcp -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95znet - -# remove gentoo specific modules -rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash - mkdir -p %{buildroot}/boot/dracut mkdir -p %{buildroot}%{_localstatedir}/lib/dracut/overlay mkdir -p %{buildroot}%{_localstatedir}/log @@ -239,6 +235,24 @@ %dir %{_localstatedir}/lib/dracut %dir %{_localstatedir}/lib/dracut/overlay +%files extra +%defattr(-,root,root,0755) +%license COPYING + +# Use systemd-analyze instead, does not need dracut support +%{dracutlibdir}/modules.d/00bootchart + +%{dracutlibdir}/modules.d/02caps +%{dracutlibdir}/modules.d/90stratis +%{dracutlibdir}/modules.d/00dash +%{dracutlibdir}/modules.d/05busybox +%{dracutlibdir}/modules.d/50gensplash + +# RH-specific s390 modules, we take another approach +%{dracutlibdir}/modules.d/95dasd +%{dracutlibdir}/modules.d/95zfcp +%{dracutlibdir}/modules.d/95znet + %files %defattr(-,root,root,0755) %license COPYING @@ -300,7 +314,6 @@ %{dracutlibdir}/modules.d/00systemd %{dracutlibdir}/modules.d/00warpclock %{dracutlibdir}/modules.d/01systemd-initrd -%{dracutlibdir}/modules.d/02caps %{dracutlibdir}/modules.d/02systemd-networkd %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue @@ -330,9 +343,9 @@ %{dracutlibdir}/modules.d/90lvm %{dracutlibdir}/modules.d/90mdraid %{dracutlibdir}/modules.d/90multipath +%{dracutlibdir}/modules.d/90nvdimm %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/90qemu-net -%{dracutlibdir}/modules.d/90stratis %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop %{dracutlibdir}/modules.d/91zipl @@ -369,24 +382,9 @@ %{dracutlibdir}/modules.d/99shutdown %{dracutlibdir}/modules.d/99squash %{dracutlibdir}/modules.d/99suse +%{dracutlibdir}/modules.d/99suse-initrd %{dracutlibdir}/modules.d/99uefi-lib -# executable fixups -%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/90livenet/livenet-generator.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/90multipath/multipath-shutdown.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/parse-dcssblk.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/module-setup.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/cleanup-fcoe.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/stop-fcoe.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/module-setup.sh - -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/sas_transport_scan_lun.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/parse-lunmask.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/fc_transport_scan_lun.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/module-setup.sh - %config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0640,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_unitdir}/initrd.target.wants ++++++ dracut-049.1+git125.e2b2c9ef.tar.xz -> dracut-049.1+git135.46dceb02.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/ifup.sh new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/ifup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/ifup.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/ifup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -70,7 +70,7 @@ [ -n "${MTU}" ] && ip $1 link set mtu "$MTU" dev "$INTERFACE" # Setup hostname - [ -n "${HOSTNAME}" ] && hostname "$HOSTNAME" + [ -n "${HOSTNAME}" ] && echo $HOSTNAME > /proc/sys/kernel/hostname # If nameserver= has not been specified, use what dhcp provides if [ ! -s /tmp/net.$netif.resolv.conf.ipv${1:1:1} ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/35network-legacy/module-setup.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/35network-legacy/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -4,7 +4,7 @@ check() { local _program - require_binaries ip sed awk grep hostname || return 1 + require_binaries ip sed awk grep || return 1 require_any_binary arping arping2 wicked || return 1 require_any_binary dhclient wicked || return 1 @@ -24,13 +24,12 @@ # called by dracut install() { local _arch _i _dir - inst_multiple ip dhclient sed awk grep - + inst_multiple ip sed awk grep + inst_multiple -o dhclient inst_multiple -o arping arping2 strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping" "$initdir/bin/arping2" inst_multiple -o wicked inst_multiple -o ping ping6 - inst_multiple -o hostname inst_multiple -o teamd teamdctl teamnl inst_simple /etc/libnl/classid inst_script "$moddir/ifup.sh" "/sbin/ifup" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/90kernel-modules/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/90kernel-modules/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/90kernel-modules/module-setup.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/90kernel-modules/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -42,7 +42,7 @@ yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \ atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus \ virtio virtio_blk virtio_ring virtio_pci virtio_scsi \ - "=drivers/pcmcia" =ide nvme vmd nfit + "=drivers/pcmcia" =ide nvme vmd if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]; then # arm/aarch64 specific modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/90nvdimm/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/90nvdimm/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/90nvdimm/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/90nvdimm/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -0,0 +1,31 @@ +#!/bin/bash + +# called by dracut +check() { + if [[ ! $hostonly ]]; then + return 0 + fi + [[ $DRACUT_KERNEL_MODALIASES && -f "$DRACUT_KERNEL_MODALIASES" ]] && \ + grep -q libnvdimm "$DRACUT_KERNEL_MODALIASES" && return 0 + return 255 +} + +# called by dracut +depends() { + return 0 +} + +# called by dracut +installkernel() { + # Directories to search for NVDIMM "providers" (firmware drivers) + # These modules call "nvdimm_bus_register()". + local _provider_dirs='=drivers/nvdimm =drivers/acpi =arch/powerpc' + + #instmods() will take care of hostonly + dracut_instmods -o -s nvdimm_bus_register $_provider_dirs +} + +# called by dracut +install() { + inst_multiple -o ndctl +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/lldpad.sh new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/lldpad.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/lldpad.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/lldpad.sh 2020-03-11 19:44:38.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/bash -if ! getargbool 0 rd.nofcoe ; then +if getargbool 0 rd.nofcoe ; then info "rd.nofcoe=0: skipping lldpad activation" exit 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/parse-fcoe.sh new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/parse-fcoe.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/95fcoe/parse-fcoe.sh 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/95fcoe/parse-fcoe.sh 2020-03-11 19:44:38.000000000 +0100 @@ -13,7 +13,7 @@ # fcoe=eth0:nodcb:vn2vn # fcoe=4a:3f:4c:04:f8:d7:nodcb:fabric -if ! getargbool 0 rd.nofcoe ; then +if getargbool 0 rd.nofcoe ; then info "rd.nofcoe=0: skipping fcoe" return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/modules.d/99suse-initrd/module-setup.sh new/dracut-049.1+git135.46dceb02/modules.d/99suse-initrd/module-setup.sh --- old/dracut-049.1+git125.e2b2c9ef/modules.d/99suse-initrd/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/modules.d/99suse-initrd/module-setup.sh 2020-03-11 19:44:38.000000000 +0100 @@ -0,0 +1,41 @@ +#!/bin/bash + +# Parse SUSE kernel module dependencies +# +# Kernel modules using "request_module" function may not show up in modprobe +# To worka round this, add depedencies in the following form: +# # SUSE_INITRD: module_name REQUIRES module1 module2 ... +# to /etc/modprobe.d/*.conf + +# called by dracut +check() { + # Skip the module if no SUSE INITRD is used + grep -q "^# SUSE INITRD: " $(get_modprobe_conf_files) +} + +get_modprobe_conf_files() { + ls /etc/modprobe.d/*.conf /run/modules.d/*.conf /lib/modules.d/*.conf \ + 2>/dev/null + return 0 +} + +# called by dracut +installkernel() { + local line mod reqs all_mods= + + while read -r line; do + mod="${line##*SUSE INITRD: }" + mod="${mod%% REQUIRES*}" + reqs="${line##*REQUIRES }" + if [[ ! $hostonly ]] || grep -q "^$mod\$" "$DRACUT_KERNEL_MODALIASES" + then + all_mods="$all_mods $reqs" + fi + done <<< "$(grep -h "^# SUSE INITRD: " $(get_modprobe_conf_files))" + + # strip whitespace + all_mods="$(echo $all_mods)" + if [[ "$all_mods" ]]; then + dracut_instmods $all_mods + fi +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-049.1+git125.e2b2c9ef/suse/dracut.spec new/dracut-049.1+git135.46dceb02/suse/dracut.spec --- old/dracut-049.1+git125.e2b2c9ef/suse/dracut.spec 2020-03-02 18:04:52.000000000 +0100 +++ new/dracut-049.1+git135.46dceb02/suse/dracut.spec 2020-03-11 19:44:38.000000000 +0100 @@ -104,6 +104,17 @@ %description tools This package contains tools to assemble the local initrd and host configuration. +%package extra +Summary: Dracut modules usually not required for normal operation +Group: System/Base +Requires: %{name} = %{version}-%{release} +Requires: evmctl +Requires: keyutils + +%description extra +This package contains all modules that are part of dracut upstream +but are not normally supported or required. + %prep %setup -q @@ -119,21 +130,6 @@ echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh -# use systemd-analyze instead, does not need dracut support -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00bootchart - -# not supported -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox - -# Remove RH-specific s390 modules -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95dasd -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95zfcp -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95znet - -# remove gentoo specific modules -rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash - mkdir -p %{buildroot}/boot/dracut mkdir -p %{buildroot}%{_localstatedir}/lib/dracut/overlay mkdir -p %{buildroot}%{_localstatedir}/log @@ -239,6 +235,24 @@ %dir %{_localstatedir}/lib/dracut %dir %{_localstatedir}/lib/dracut/overlay +%files extra +%defattr(-,root,root,0755) +%license COPYING + +# Use systemd-analyze instead, does not need dracut support +%{dracutlibdir}/modules.d/00bootchart + +%{dracutlibdir}/modules.d/02caps +%{dracutlibdir}/modules.d/90stratis +%{dracutlibdir}/modules.d/00dash +%{dracutlibdir}/modules.d/05busybox +%{dracutlibdir}/modules.d/50gensplash + +# RH-specific s390 modules, we take another approach +%{dracutlibdir}/modules.d/95dasd +%{dracutlibdir}/modules.d/95zfcp +%{dracutlibdir}/modules.d/95znet + %files %defattr(-,root,root,0755) %license COPYING @@ -300,7 +314,6 @@ %{dracutlibdir}/modules.d/00systemd %{dracutlibdir}/modules.d/00warpclock %{dracutlibdir}/modules.d/01systemd-initrd -%{dracutlibdir}/modules.d/02caps %{dracutlibdir}/modules.d/02systemd-networkd %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue @@ -330,9 +343,9 @@ %{dracutlibdir}/modules.d/90lvm %{dracutlibdir}/modules.d/90mdraid %{dracutlibdir}/modules.d/90multipath +%{dracutlibdir}/modules.d/90nvdimm %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/90qemu-net -%{dracutlibdir}/modules.d/90stratis %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop %{dracutlibdir}/modules.d/91zipl @@ -369,24 +382,9 @@ %{dracutlibdir}/modules.d/99shutdown %{dracutlibdir}/modules.d/99squash %{dracutlibdir}/modules.d/99suse +%{dracutlibdir}/modules.d/99suse-initrd %{dracutlibdir}/modules.d/99uefi-lib -# executable fixups -%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/90livenet/livenet-generator.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/90multipath/multipath-shutdown.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/parse-dcssblk.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/module-setup.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/cleanup-fcoe.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/stop-fcoe.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/module-setup.sh - -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/sas_transport_scan_lun.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/parse-lunmask.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/fc_transport_scan_lun.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/95lunmask/module-setup.sh - %config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0640,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_unitdir}/initrd.target.wants ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.Z8APvy/_old 2020-03-17 13:05:57.369605967 +0100 +++ /var/tmp/diff_new_pack.Z8APvy/_new 2020-03-17 13:05:57.369605967 +0100 @@ -1,5 +1,5 @@ name: dracut -version: 049.1+git125.e2b2c9ef -mtime: 1583168692 -commit: e2b2c9ef43e696e6d3ea4fc88754247531f33b89 +version: 049.1+git135.46dceb02 +mtime: 1583952278 +commit: 46dceb021076004a85a089ff1f886b8b3edb7924
