Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2022-01-21 01:25:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Fri Jan 21 01:25:00 2022 rev:181 rq:947267 version:055+suse.194.gdd41932a
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2021-12-16
02:00:31.047617746 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new.1938/dracut.changes 2022-01-21
01:25:06.706714041 +0100
@@ -1,0 +2,18 @@
+Mon Jan 17 11:20:56 UTC 2022 - antonio.fei...@suse.com
+
+- Update to version 055+suse.194.gdd41932a:
+ * fix(network-legacy): add wicked as an alternative to arping (bsc#1193670)
+ * fix(network): add wicked as an alternative to arping (bsc#1193670)
+
+-------------------------------------------------------------------
+Mon Jan 17 09:45:53 UTC 2022 - antonio.fei...@suse.com
+
+- Update to version 055+suse.191.g67eb4ea8:
+ * fix(dracut-initramfs-restore.sh): add test for SUSE initrd name
(bsc#1194570)
+ * fix(dracut.spec): require util-linux-systemd (bsc#1194162)
+ * fix(network-wicked): multiple path corrections
+ * fix(drm): add privacy screen modules to the initrd (bsc#1193590)
+ * fix(dracut.spec): update usrmerged mkinitrd dir
+ * fix(url-lib): improve ca-bundle detection (bsc#1175892)
+
+-------------------------------------------------------------------
Old:
----
dracut-055+suse.179.g3cf989c2.obscpio
New:
----
dracut-055+suse.194.gdd41932a.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.GsJqzl/_old 2022-01-21 01:25:07.338709708 +0100
+++ /var/tmp/diff_new_pack.GsJqzl/_new 2022-01-21 01:25:07.342709682 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dracut
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,8 +18,14 @@
%define dracutlibdir %{_prefix}/lib/dracut
+%if 0%{?suse_version} >= 1550
+%define dracut_sbindir %{_sbindir}
+%else
+%define dracut_sbindir /sbin
+%endif
+
Name: dracut
-Version: 055+suse.179.g3cf989c2
+Version: 055+suse.194.gdd41932a
Release: 0
Summary: Initramfs generator using udev
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -56,11 +62,12 @@
Requires: systemd-sysvinit
Requires: udev > 166
Requires: util-linux >= 2.21
+Requires: util-linux-systemd >= 2.36.2
Recommends: xz
Requires: zstd
# We use 'btrfs fi usage' that was not present before
Conflicts: btrfsprogs < 3.18
-# suse-module-tools >= 16.0.3 is prepared for the removal of mkinitrd-suse.sh
+# suse-module-tools >= 15.4.7 is prepared for the removal of mkinitrd-suse.sh
Conflicts: suse-module-tools < 15.4.7
%{?systemd_requires}
@@ -122,6 +129,7 @@
Requires: %{name} = %{version}-%{release}
Requires: dracut
Obsoletes: mkinitrd < 2.8.2
+Provides: dracut:/sbin/mkinitrd
Provides: mkinitrd = 2.8.2
%description mkinitrd-deprecated
@@ -158,11 +166,7 @@
install -m 0644 suse/s390x_persistent_device.conf
%{buildroot}%{_sysconfdir}/dracut.conf.d/10-s390x_persistent_device.conf
%endif
-%if 0%{?suse_version} < 1550
- install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/sbin/mkinitrd
-%else
- install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/%{_sbindir}/mkinitrd
-%endif
+install -D -m 0755 suse/mkinitrd-suse.sh
%{buildroot}/%{dracut_sbindir}/mkinitrd
mv %{buildroot}%{_mandir}/man8/mkinitrd-suse.8
%{buildroot}%{_mandir}/man8/mkinitrd.8
@@ -254,11 +258,7 @@
%{dracutlibdir}/modules.d/95znet
%files mkinitrd-deprecated
-%if 0%{?suse_version} < 1550
- /sbin/mkinitrd
-%else
- %{_sbindir}/mkinitrd
-%endif
+%{dracut_sbindir}/mkinitrd
%{_mandir}/man8/mkinitrd.8*
%files
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.GsJqzl/_old 2022-01-21 01:25:07.394709325 +0100
+++ /var/tmp/diff_new_pack.GsJqzl/_new 2022-01-21 01:25:07.398709298 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/opensuse/dracut.git</param>
- <param
name="changesrevision">83368e246ecc7deb2f4377bb93530b5b1654855f</param></service></servicedata>
+ <param
name="changesrevision">11521375426fa21ef03a7701b4b587478809f263</param></service></servicedata>
(No newline at EOF)
++++++ dracut-055+suse.179.g3cf989c2.obscpio ->
dracut-055+suse.194.gdd41932a.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/dracut-initramfs-restore.sh
new/dracut-055+suse.194.gdd41932a/dracut-initramfs-restore.sh
--- old/dracut-055+suse.179.g3cf989c2/dracut-initramfs-restore.sh
2021-12-08 10:54:05.000000000 +0100
+++ new/dracut-055+suse.194.gdd41932a/dracut-initramfs-restore.sh
2022-01-17 12:16:47.000000000 +0100
@@ -24,15 +24,14 @@
&& [[ $MACHINE_ID ]] \
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
- IMG="/boot/initramfs-${KERNEL_VERSION}.img"
+elif [[ -f /boot/initrd-${KERNEL_VERSION} ]]; then
+ IMG="/boot/initrd-${KERNEL_VERSION}"
elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then
IMG="/lib/modules/${KERNEL_VERSION}/initrd"
else
echo "No initramfs image found to restore!"
exit 1
fi
-[[ -f $IMG ]] || IMG="/boot/initrd-${KERNEL_VERSION}"
cd /run/initramfs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/modules.d/35network-legacy/dhclient-script.sh
new/dracut-055+suse.194.gdd41932a/modules.d/35network-legacy/dhclient-script.sh
---
old/dracut-055+suse.179.g3cf989c2/modules.d/35network-legacy/dhclient-script.sh
2021-12-08 10:54:05.000000000 +0100
+++
new/dracut-055+suse.194.gdd41932a/modules.d/35network-legacy/dhclient-script.sh
2022-01-17 12:16:47.000000000 +0100
@@ -187,11 +187,16 @@
warn "Duplicate address detected for $new_ip_address while
doing dhcp. retrying"
exit 1
fi
- else
+ elif command -v arping > /dev/null; then
if ! arping -f -q -D -c 2 -I "$netif" "$new_ip_address"; then
warn "Duplicate address detected for $new_ip_address while
doing dhcp. retrying"
exit 1
fi
+ else
+ if ! wicked arp verify --quiet --count 2 --interval 1000
"$netif" "$new_ip_address"; then
+ warn "Duplicate address detected for $new_ip_address while
doing dhcp. retrying"
+ exit 1
+ fi
fi
fi
unset layer2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/modules.d/35network-legacy/ifup.sh
new/dracut-055+suse.194.gdd41932a/modules.d/35network-legacy/ifup.sh
--- old/dracut-055+suse.179.g3cf989c2/modules.d/35network-legacy/ifup.sh
2021-12-08 10:54:05.000000000 +0100
+++ new/dracut-055+suse.194.gdd41932a/modules.d/35network-legacy/ifup.sh
2022-01-17 12:16:47.000000000 +0100
@@ -332,11 +332,16 @@
warn "Duplicate address detected for $ip for interface
$netif."
return 1
fi
- else
+ elif command -v arping > /dev/null; then
if ! arping -f -q -D -c 2 -I "$netif" "$ip"; then
warn "Duplicate address detected for $ip for interface
$netif."
return 1
fi
+ else
+ if ! wicked arp verify --quiet --count 2 --interval 1000
"$netif" "$ip"; then
+ warn "Duplicate address detected for $ip for interface
$netif."
+ return 1
+ fi
fi
fi
ip addr flush dev "$netif"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/modules.d/35network-legacy/module-setup.sh
new/dracut-055+suse.194.gdd41932a/modules.d/35network-legacy/module-setup.sh
---
old/dracut-055+suse.179.g3cf989c2/modules.d/35network-legacy/module-setup.sh
2021-12-08 10:54:05.000000000 +0100
+++
new/dracut-055+suse.194.gdd41932a/modules.d/35network-legacy/module-setup.sh
2022-01-17 12:16:47.000000000 +0100
@@ -33,7 +33,9 @@
inst_multiple ip dhclient sed awk grep pgrep tr expr
inst_multiple -o arping arping2
- strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping"
"$initdir/bin/arping2"
+ if command -v arping > /dev/null; then
+ strstr "$(arping 2>&1)" "ARPing 2" && mv "$initdir/bin/arping"
"$initdir/bin/arping2"
+ fi
inst_multiple -o wicked
inst_multiple -o ping ping6
inst_multiple -o teamd teamdctl teamnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/modules.d/35network-wicked/module-setup.sh
new/dracut-055+suse.194.gdd41932a/modules.d/35network-wicked/module-setup.sh
---
old/dracut-055+suse.179.g3cf989c2/modules.d/35network-wicked/module-setup.sh
2021-12-08 10:54:05.000000000 +0100
+++
new/dracut-055+suse.194.gdd41932a/modules.d/35network-wicked/module-setup.sh
2022-01-17 12:16:47.000000000 +0100
@@ -33,15 +33,23 @@
inst_dir /etc/wicked/extensions
inst_dir /usr/share/wicked/schema
- inst_dir /usr/lib/wicked/bin
+ if [ -d /usr/lib/wicked/bin ]; then
+ inst_dir /usr/lib/wicked/bin
+ inst_multiple "/usr/lib/wicked/bin/*"
+ elif [ -d /usr/libexec/wicked/bin ]; then
+ inst_dir /usr/libexec/wicked/bin
+ inst_multiple "/usr/libexec/wicked/bin/*"
+ fi
inst_dir /var/lib/wicked
inst_multiple "/etc/wicked/*.xml"
inst_multiple "/etc/wicked/extensions/*"
- inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*"
+ if [ -f /etc/dbus-1/system.d/org.opensuse.Network.conf ]; then
+ inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*"
+ elif [ -f /usr/share/dbus-1/system.d/org.opensuse.Network.conf ]; then
+ inst_multiple "/usr/share/dbus-1/system.d/org.opensuse.Network*"
+ fi
inst_multiple "/usr/share/wicked/schema/*"
- inst_multiple "/usr/lib/wicked/bin/*"
- inst_multiple "/usr/libexec/wicked/bin/*"
inst_multiple "/usr/sbin/wicked*"
wicked_units=(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/modules.d/40network/net-lib.sh
new/dracut-055+suse.194.gdd41932a/modules.d/40network/net-lib.sh
--- old/dracut-055+suse.179.g3cf989c2/modules.d/40network/net-lib.sh
2021-12-08 10:54:05.000000000 +0100
+++ new/dracut-055+suse.194.gdd41932a/modules.d/40network/net-lib.sh
2022-01-17 12:16:47.000000000 +0100
@@ -188,8 +188,10 @@
if [ "$layer2" != "0" ] && [ -n "$dest" ] && ! strstr "$dest" ":"; then
if command -v arping2 > /dev/null; then
arping2 -q -C 1 -c 60 -I "$netif" "$dest" || info "Resolving $dest
via ARP on $netif failed"
- else
+ elif command -v arping > /dev/null; then
arping -q -f -w 60 -I "$netif" "$dest" || info "Resolving $dest
via ARP on $netif failed"
+ elif command -v wicked > /dev/null; then
+ wicked arp ping --quiet --interval 1000 --timeout 60000 "$netif"
"$dest" || info "Resolving $dest via ARP on $netif failed"
fi
fi
unset layer2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/modules.d/45url-lib/module-setup.sh
new/dracut-055+suse.194.gdd41932a/modules.d/45url-lib/module-setup.sh
--- old/dracut-055+suse.179.g3cf989c2/modules.d/45url-lib/module-setup.sh
2021-12-08 10:54:05.000000000 +0100
+++ new/dracut-055+suse.194.gdd41932a/modules.d/45url-lib/module-setup.sh
2022-01-17 12:16:47.000000000 +0100
@@ -15,10 +15,10 @@
# called by dracut
install() {
- local _dir _crt _found _lib _nssckbi _p11roots _p11root
+ local _dir _crt _crts _found _lib _nssckbi _p11roots _p11root
inst_simple "$moddir/url-lib.sh" "/lib/url-lib.sh"
inst_multiple -o ctorrent
- inst_multiple curl
+ inst_multiple curl sed
if curl --version | grep -qi '\bNSS\b'; then
# also install libs for curl https
inst_libdir_file "libnsspem.so*"
@@ -29,21 +29,28 @@
for _dir in $libdirs; do
[[ -d $dracutsysrootdir$_dir ]] || continue
- for _lib in "$dracutsysrootdir$_dir"/libcurl.so.*; do
+ for _lib in "$dracutsysrootdir$_dir"/libcurl.so.*
"$dracutsysrootdir$_dir"/libcrypto.so.*; do
[[ -e $_lib ]] || continue
if ! [[ $_nssckbi ]]; then
read -r -d '' _nssckbi < <(grep -F --binary-files=text -z
libnssckbi "$_lib")
fi
- read -r -d '' _crt < <(grep -F --binary-files=text -z .crt "$_lib")
+ read -r -d '' _crt < <(grep -E --binary-files=text -z
"\.(pem|crt)" "$_lib" | sed 's/\x0//g')
[[ $_crt ]] || continue
[[ $_crt == /*/* ]] || continue
+ if [[ -e $_crt ]]; then
+ _crts="$_crts $_crt"
+ _found=1
+ fi
+ done
+ done
+ if [[ $_found ]] && [[ -n $_crts ]]; then
+ for _crt in $_crts; do
if ! inst "${_crt#$dracutsysrootdir}"; then
dwarn "Couldn't install '$_crt' SSL CA cert bundle; HTTPS
might not work."
continue
fi
- _found=1
done
- done
+ fi
# If we found no cert bundle files referenced in libcurl but we
# *did* find a mention of libnssckbi (checked above), install it.
# If its truly NSS libnssckbi, it includes its own trust bundle,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-055+suse.179.g3cf989c2/modules.d/50drm/module-setup.sh
new/dracut-055+suse.194.gdd41932a/modules.d/50drm/module-setup.sh
--- old/dracut-055+suse.179.g3cf989c2/modules.d/50drm/module-setup.sh
2021-12-08 10:54:05.000000000 +0100
+++ new/dracut-055+suse.194.gdd41932a/modules.d/50drm/module-setup.sh
2022-01-17 12:16:47.000000000 +0100
@@ -29,6 +29,8 @@
# as we could e.g. be in the installer; nokmsboot boot parameter will
disable
# loading of the driver if needed
if [[ $hostonly ]]; then
+ local i modlink modname
+
for i in
/sys/bus/{pci/devices,platform/devices,virtio/devices,soc/devices/soc?}/*/modalias;
do
[[ -e $i ]] || continue
[[ -n $(< "$i") ]] || continue
@@ -39,7 +41,19 @@
fi
fi
done
+ # if there is a privacy screen then its driver must be loaded before
the
+ # kms driver will bind, otherwise its probe() will return -EPROBE_DEFER
+ # note privacy screens always register, even with e.g. nokmsboot
+ for i in /sys/class/drm/privacy_screen-*/device/driver/module; do
+ [[ -L $i ]] || continue
+ modlink=$(readlink "$i")
+ modname=$(basename "$modlink")
+ instmods "$modname"
+ done
else
dracut_instmods -o -s
"drm_crtc_init|drm_dev_register|drm_encoder_init" "=drivers/gpu/drm"
"=drivers/staging"
+ # also include privacy screen providers (see above comment)
+ # atm all providers live under drivers/platform/x86
+ dracut_instmods -o -s "drm_privacy_screen_register"
"=drivers/platform/x86"
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-055+suse.179.g3cf989c2/suse/dracut.spec
new/dracut-055+suse.194.gdd41932a/suse/dracut.spec
--- old/dracut-055+suse.179.g3cf989c2/suse/dracut.spec 2021-12-08
10:54:05.000000000 +0100
+++ new/dracut-055+suse.194.gdd41932a/suse/dracut.spec 2022-01-17
12:16:47.000000000 +0100
@@ -17,6 +17,12 @@
%define dracutlibdir %{_prefix}/lib/dracut
+%if 0%{?suse_version} >= 1550
+%define dracut_sbindir %{_sbindir}
+%else
+%define dracut_sbindir /sbin
+%endif
+
Name: dracut
Version: 054
Release: 0
@@ -55,11 +61,12 @@
Requires: systemd-sysvinit
Requires: udev > 166
Requires: util-linux >= 2.21
+Requires: util-linux-systemd >= 2.36.2
Recommends: xz
Requires: zstd
# We use 'btrfs fi usage' that was not present before
Conflicts: btrfsprogs < 3.18
-# suse-module-tools >= 16.0.3 is prepared for the removal of mkinitrd-suse.sh
+# suse-module-tools >= 15.4.7 is prepared for the removal of mkinitrd-suse.sh
Conflicts: suse-module-tools < 15.4.7
%{?systemd_requires}
@@ -122,6 +129,7 @@
Requires: dracut
Obsoletes: mkinitrd < 2.8.2
Provides: mkinitrd = 2.8.2
+Provides: dracut:/sbin/mkinitrd
%description mkinitrd-deprecated
This package contains the legacy initrd script for dracut.
@@ -157,11 +165,7 @@
install -m 0644 suse/s390x_persistent_device.conf
%{buildroot}%{_sysconfdir}/dracut.conf.d/10-s390x_persistent_device.conf
%endif
-%if 0%{?suse_version} < 1550
- install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/sbin/mkinitrd
-%else
- install -D -m 0755 suse/mkinitrd-suse.sh %{buildroot}/%{_sbindir}/mkinitrd
-%endif
+install -D -m 0755 suse/mkinitrd-suse.sh
%{buildroot}/%{dracut_sbindir}/mkinitrd
mv %{buildroot}%{_mandir}/man8/mkinitrd-suse.8
%{buildroot}%{_mandir}/man8/mkinitrd.8
@@ -253,11 +257,7 @@
%{dracutlibdir}/modules.d/95znet
%files mkinitrd-deprecated
-%if 0%{?suse_version} < 1550
- /sbin/mkinitrd
-%else
- %{_sbindir}/mkinitrd
-%endif
+%{dracut_sbindir}/mkinitrd
%{_mandir}/man8/mkinitrd.8*
%files
++++++ dracut.obsinfo ++++++
--- /var/tmp/diff_new_pack.GsJqzl/_old 2022-01-21 01:25:07.634707680 +0100
+++ /var/tmp/diff_new_pack.GsJqzl/_new 2022-01-21 01:25:07.638707652 +0100
@@ -1,6 +1,6 @@
name: dracut
-version: 055+suse.179.g3cf989c2
-mtime: 1638957245
-commit: 3cf989c235a7bebd1273e93b7c4f6960f4772a18
+version: 055+suse.194.gdd41932a
+mtime: 1642418207
+commit: dd41932a78c4b1934f4876de169c1dcf205c713f
