From 868aaf1655e6edd5fb0c862b185bcf271515f524 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Jul 18 2022 10:36:19 +0000 Subject: Upgrade to dracut 057 also sync up .spec file with upstream. --- diff --git a/0001-Never-enable-the-bluetooth-module-by-default-1521.patch b/0001-Never-enable-the-bluetooth-module-by-default-1521.patch deleted file mode 100644 index f815750..0000000 --- a/0001-Never-enable-the-bluetooth-module-by-default-1521.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ea8c9b1c4f39c52fc45788516dea19892cc275f7 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 10 Jun 2021 08:41:30 -0700 -Subject: [PATCH] Never enable the bluetooth module by default (#1521) - -Signed-off-by: Adam Williamson ---- - modules.d/62bluetooth/module-setup.sh | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/modules.d/62bluetooth/module-setup.sh b/modules.d/62bluetooth/module-setup.sh -index b8270dd5..fd22670d 100755 ---- a/modules.d/62bluetooth/module-setup.sh -+++ b/modules.d/62bluetooth/module-setup.sh -@@ -6,14 +6,7 @@ - check() { - # If the binary(s) requirements are not fulfilled the module can't be installed - require_any_binary /usr/lib/bluetooth/bluetoothd /usr/libexec/bluetooth/bluetoothd || return 1 -- -- if [[ $hostonly ]]; then -- # Include by default if a Peripheral (0x500) is found of minor class: -- # * Keyboard (0x40) -- # * Keyboard/pointing (0xC0) -- grep -qiE 'Class=0x[0-9a-f]{3}5[4c]0' /var/lib/bluetooth/*/*/info 2> /dev/null && return 0 -- fi -- -+ # disabled until https://github.com/dracutdevs/dracut/issues/1521 is resolved - return 255 - } - --- -2.32.0.rc2 - diff --git a/1755.patch b/1755.patch deleted file mode 100644 index d1624de..0000000 --- a/1755.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e488704701b73d05384cf38a017c055b95317b34 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Fri, 18 Mar 2022 15:42:42 +0100 -Subject: [PATCH] fix(dracut-initramfs-restore.sh): unpack uncompressed initrd - as last option - -Attempting to unpack the initrd assuming it is uncompressed when -it is delays the shutdown process by several seconds. This must -be the last check. ---- - dracut-initramfs-restore.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh -index 3c70b42c3..2efd798c5 100644 ---- a/dracut-initramfs-restore.sh -+++ b/dracut-initramfs-restore.sh -@@ -51,13 +51,13 @@ fi - - cd /run/initramfs - --if $SKIP "$IMG" | cpio -id --no-absolute-filenames --quiet > /dev/null \ -- || $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet > /dev/null \ -+if $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet > /dev/null \ - || $SKIP "$IMG" | bzcat | cpio -id --no-absolute-filenames --quiet > /dev/null \ - || $SKIP "$IMG" | xzcat | cpio -id --no-absolute-filenames --quiet > /dev/null \ - || $SKIP "$IMG" | lz4 -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null \ - || $SKIP "$IMG" | lzop -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null \ -- || $SKIP "$IMG" | zstd -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null; then -+ || $SKIP "$IMG" | zstd -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null \ -+ || $SKIP "$IMG" | cpio -id --no-absolute-filenames --quiet > /dev/null; then - rm -f -- .need_shutdown - else - # something failed, so we clean up diff --git a/dracut.spec b/dracut.spec index 8b3cc8e..3cdf337 100644 --- a/dracut.spec +++ b/dracut.spec @@ -5,10 +5,10 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 2 +%define dist_free_release 1 Name: dracut -Version: 056 +Version: 057 Release: %{dist_free_release}%{?dist} Summary: Initramfs generator using udev @@ -32,15 +32,6 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar Source1: https://www.gnu.org/licenses/lgpl-2.1.txt -# Never auto-enable bluetooth module (but it can be manually included -# for debugging) - workaround for RHBZ #1964879 / upstream #1521, to -# be removed when that is properly fixed -Patch0: 0001-Never-enable-the-bluetooth-module-by-default-1521.patch -# Add upstream patch to change order of initramfs decompression to -# hopefully avoid compose failures due to oz trying to convert -# garbage output to utf-8 -Patch1: https://patch-diff.githubusercontent.com/raw/dracutdevs/dracut/pull/1755.patch - BuildRequires: bash BuildRequires: git-core BuildRequires: pkgconfig(libkmod) >= 23 @@ -227,12 +218,8 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash # we do not support mksh in the initramfs rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00mksh -# remove gentoo specific modules -rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash - %if %{defined _unitdir} # with systemd IMA and selinux modules do not make sense -rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01systemd-integritysetup rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/96securityfs rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity @@ -258,7 +245,6 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00warpclock mkdir -p $RPM_BUILD_ROOT/boot/dracut mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log -touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs %if 0%{?fedora} || 0%{?rhel} @@ -339,6 +325,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/01systemd-coredump %{dracutlibdir}/modules.d/01systemd-hostnamed %{dracutlibdir}/modules.d/01systemd-initrd +%{dracutlibdir}/modules.d/01systemd-integritysetup %{dracutlibdir}/modules.d/01systemd-journald %{dracutlibdir}/modules.d/01systemd-ldconfig %{dracutlibdir}/modules.d/01systemd-modules-load @@ -369,6 +356,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/50plymouth %{dracutlibdir}/modules.d/62bluetooth %{dracutlibdir}/modules.d/80lvmmerge +%{dracutlibdir}/modules.d/80lvmthinpool-monitor %{dracutlibdir}/modules.d/90btrfs %{dracutlibdir}/modules.d/90crypt %{dracutlibdir}/modules.d/90dm @@ -396,6 +384,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/95terminfo %{dracutlibdir}/modules.d/95udev-rules %{dracutlibdir}/modules.d/95virtfs +%{dracutlibdir}/modules.d/95virtiofs %ifarch s390 s390x %{dracutlibdir}/modules.d/80cms %{dracutlibdir}/modules.d/81cio_ignore @@ -409,7 +398,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/95zfcp_rules %endif %if %{undefined _unitdir} -%{dracutlibdir}/modules.d/01systemd-integritysetup %{dracutlibdir}/modules.d/96securityfs %{dracutlibdir}/modules.d/97masterkey %{dracutlibdir}/modules.d/98integrity @@ -425,10 +413,10 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/99memstrack %{dracutlibdir}/modules.d/99fs-lib %{dracutlibdir}/modules.d/99shutdown -%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_sharedstatedir}/initramfs %if %{defined _unitdir} %{_unitdir}/dracut-shutdown.service +%{_unitdir}/dracut-shutdown-onfailure.service %{_unitdir}/sysinit.target.wants/dracut-shutdown.service %{_unitdir}/dracut-cmdline.service %{_unitdir}/dracut-initqueue.service @@ -437,7 +425,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_unitdir}/dracut-pre-pivot.service %{_unitdir}/dracut-pre-trigger.service %{_unitdir}/dracut-pre-udev.service -%{_unitdir}/dracut-shutdown-onfailure.service %{_unitdir}/initrd.target.wants/dracut-cmdline.service %{_unitdir}/initrd.target.wants/dracut-initqueue.service %{_unitdir}/initrd.target.wants/dracut-mount.service @@ -450,6 +437,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %files network %{dracutlibdir}/modules.d/01systemd-networkd +%{dracutlibdir}/modules.d/35connman %{dracutlibdir}/modules.d/35network-manager %{dracutlibdir}/modules.d/35network-legacy %{dracutlibdir}/modules.d/35network-wicked @@ -499,6 +487,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Mon Jul 18 2022 Pavel Valena - 057-1 +- Update to 057 + * Tue Apr 19 2022 Kevin Fenzi - 056-2 - Add already upstream patch to change dracut-initramfs-restore to hopefully not break oz/composes diff --git a/sources b/sources index db37e5f..0c11c95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dracut-056.tar.xz) = 19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2 +SHA512 (dracut-057.tar.xz) = 5169dd42c59a1a3fde21da984ab998eb04bf4aac384a6aa4ada3b0febd1e8f0c7fc727b1e8aed30f6584acbe323cbdb4021d18109b8baec907dadcc8cd4ceec9