From b1e7b45d32ffdaba84dd786fb7d742d974e5674b Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Jun 09 2021 20:27:02 +0000 Subject: Upgrade to Fedora's dracut 055 This fixes the removal of duplicate files from the squash image in 053, which did not expand variables due to single-quoting See: https://github.com/dracutdevs/dracut/commit/95ea16aa606912b7cc8f9942481c8a889b640c15 https://github.com/dracutdevs/dracut/commit/8f7c332e488f88e5845a3c7954af7934c2f1e37b Signed-off-by: Michel Alexandre Salim --- diff --git a/.dracut.metadata b/.dracut.metadata index c723cff..7e14e6b 100644 --- a/.dracut.metadata +++ b/.dracut.metadata @@ -1 +1 @@ -307271a27d616c23ef24576fd8a9185da15cd4a1 SOURCES/dracut-053.tar.xz +1c0eb80f930dc1e4baac1912239aee233a108bc3 SOURCES/dracut-055.tar.xz diff --git a/.gitignore b/.gitignore index 527b351..896f693 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dracut-053.tar.xz +SOURCES/dracut-055.tar.xz diff --git a/SOURCES/0001-fix-network-manager-no-default-deps-for-nm-run.servi.patch b/SOURCES/0001-fix-network-manager-no-default-deps-for-nm-run.servi.patch deleted file mode 100644 index 38c06cd..0000000 --- a/SOURCES/0001-fix-network-manager-no-default-deps-for-nm-run.servi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ba4bcf5f4f11ad624c647ddf4f566997186135e7 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Wed, 31 Mar 2021 16:11:41 +0200 -Subject: [PATCH] fix(network-manager): no default deps for nm-run.service - -Otherwise nm-run.service will run only in basic.target, which is too -late in the initramfs. ---- - modules.d/35network-manager/nm-run.service | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules.d/35network-manager/nm-run.service b/modules.d/35network-manager/nm-run.service -index 63fe7564..f3493c41 100644 ---- a/modules.d/35network-manager/nm-run.service -+++ b/modules.d/35network-manager/nm-run.service -@@ -2,6 +2,8 @@ - # SPDX-License-Identifier: GPL-2.0-or-later - - [Unit] -+DefaultDependencies=no -+ - #make sure all devices showed up - Wants=systemd-udev-settle.service - After=systemd-udev-settle.service --- -2.31.1 - diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec index 0fd54ac..ef9b56d 100644 --- a/SPECS/dracut.spec +++ b/SPECS/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: 053 +Version: 055 Release: %{dist_free_release}%{?dist} Summary: Initramfs generator using udev @@ -21,7 +21,8 @@ Group: System/Base # The entire source code is GPLv2+ # except install/* which is LGPLv2+ -License: GPLv2+ and LGPLv2+ +# except util/* which is GPLv2 +License: GPLv2+ and LGPLv2+ and GPLv2 URL: https://dracut.wiki.kernel.org/ @@ -31,12 +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 -# https://github.com/dracutdevs/dracut/commit/ba4bcf5f4f11ad624c647ddf4f566997186135e7 -# Fixes boot failure with some encrypted LVM configurations, see: -# https://bugzilla.redhat.com/show_bug.cgi?id=1946074 -# https://bugzilla.redhat.com/show_bug.cgi?id=1945596 -Patch0: 0001-fix-network-manager-no-default-deps-for-nm-run.servi.patch - BuildRequires: bash BuildRequires: git-core BuildRequires: pkgconfig(libkmod) >= 23 @@ -62,11 +57,6 @@ BuildRequires: docbook-xsl-stylesheets libxslt BuildRequires: asciidoc %endif -%if 0%{?suse_version} > 9999 -Obsoletes: mkinitrd < 2.6.1 -Provides: mkinitrd = 2.6.1 -%endif - Obsoletes: dracut-fips <= 047 Provides: dracut-fips = %{version}-%{release} Obsoletes: dracut-fips-aesni <= 047 @@ -271,9 +261,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse* %endif %if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999 -rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd -rm -f -- $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd.8* rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1* %endif @@ -282,7 +270,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %files %if %{with doc} -%doc README.md HACKING.md AUTHORS NEWS.md dracut.html dracut.png dracut.svg +%doc README.md docs/HACKING.md AUTHORS NEWS.md dracut.html docs/dracut.png docs/dracut.svg %endif %{!?_licensedir:%global license %%doc} %license COPYING lgpl-2.1.txt @@ -290,7 +278,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_datadir}/bash-completion/completions/dracut %{_datadir}/bash-completion/completions/lsinitrd %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 -%{_bindir}/mkinitrd %{_bindir}/lsinitrd %endif %dir %{dracutlibdir} @@ -302,6 +289,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/dracut-logger.sh %{dracutlibdir}/dracut-initramfs-restore %{dracutlibdir}/dracut-install +%{dracutlibdir}/dracut-util %{dracutlibdir}/skipcpio %config(noreplace) %{_sysconfdir}/dracut.conf %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} @@ -316,12 +304,8 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_mandir}/man8/dracut.8* %{_mandir}/man8/*service.8* %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 -%{_mandir}/man8/mkinitrd.8* %{_mandir}/man1/lsinitrd.1* %endif -%if 0%{?suse_version} -%{_mandir}/man8/mkinitrd-suse.8* -%endif %{_mandir}/man7/dracut.kernel.7* %{_mandir}/man7/dracut.cmdline.7* %{_mandir}/man7/dracut.modules.7* @@ -333,19 +317,32 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %endif %{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00systemd +%{dracutlibdir}/modules.d/00systemd-network-management %ifnarch s390 s390x %{dracutlibdir}/modules.d/00warpclock %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} %{dracutlibdir}/modules.d/01fips %endif +%{dracutlibdir}/modules.d/01systemd-ac-power %{dracutlibdir}/modules.d/01systemd-ask-password %{dracutlibdir}/modules.d/01systemd-coredump +%{dracutlibdir}/modules.d/01systemd-hostnamed %{dracutlibdir}/modules.d/01systemd-initrd +%{dracutlibdir}/modules.d/01systemd-journald +%{dracutlibdir}/modules.d/01systemd-ldconfig %{dracutlibdir}/modules.d/01systemd-modules-load %{dracutlibdir}/modules.d/01systemd-repart +%{dracutlibdir}/modules.d/01systemd-resolved +%{dracutlibdir}/modules.d/01systemd-rfkill +%{dracutlibdir}/modules.d/01systemd-sysext %{dracutlibdir}/modules.d/01systemd-sysctl %{dracutlibdir}/modules.d/01systemd-sysusers +%{dracutlibdir}/modules.d/01systemd-timedated +%{dracutlibdir}/modules.d/01systemd-timesyncd +%{dracutlibdir}/modules.d/01systemd-tmpfiles +%{dracutlibdir}/modules.d/01systemd-udevd +%{dracutlibdir}/modules.d/01systemd-veritysetup %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue %{dracutlibdir}/modules.d/04watchdog @@ -360,6 +357,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/45url-lib %{dracutlibdir}/modules.d/50drm %{dracutlibdir}/modules.d/50plymouth +%{dracutlibdir}/modules.d/62bluetooth %{dracutlibdir}/modules.d/80lvmmerge %{dracutlibdir}/modules.d/90btrfs %{dracutlibdir}/modules.d/90crypt @@ -375,6 +373,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop +%{dracutlibdir}/modules.d/91tpm2-tss %{dracutlibdir}/modules.d/95debug %{dracutlibdir}/modules.d/95fstab-sys %{dracutlibdir}/modules.d/95lunmask @@ -435,7 +434,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/50-dracut.install %files network -%{dracutlibdir}/modules.d/02systemd-networkd +%{dracutlibdir}/modules.d/01systemd-networkd %{dracutlibdir}/modules.d/35network-manager %{dracutlibdir}/modules.d/35network-legacy %{dracutlibdir}/modules.d/35network-wicked @@ -485,6 +484,34 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Thu May 27 2021 Harald Hoyer - 055-1 +- version 055 +- install the missing fsck utils + +* Fri May 21 2021 Harald Hoyer - 054-12.git20210521 +- fix `get_maj_min` for kdump +- suppress hardlink output +- sane default --kerneldir for dracut-install +- squash: don't mount the mount points if already mounted + +* Tue May 18 2021 Harald Hoyer - 054-6.git20210518 +- fix for `str_replace: command not found` + +* Mon May 17 2021 Harald Hoyer - 054-4.git20210517 +- version 054 + +* Thu Apr 22 2021 Peter Robinson - 053-5 +- Backport: fix(90kernel-modules): add watchdog drivers for generic initrd (rhbz 1592148) + +* Mon Apr 19 2021 Dusty Mabe - 053-4 +- Backport: fix(dracut-logger.sh): double dash trigger unknown logger warnings during run +- Backport: fix(network-manager): nm-run.service: don't kill forked processes +- Backport: fix(network-manager): only run NetworkManager if rd.neednet=1 +- Backport: fix(network-manager): use /run/NetworkManager/initrd/neednet in initqueue + +* Mon Apr 19 2021 Adam Williamson - 053-3 +- Fix removal of key system files when kdump enabled (thanks kasong) (#1936781) + * Thu Apr 08 2021 Adam Williamson - 053-2 - Backport upstream change reported to fix boot on some encrypted LVM setups (#1946074)