From cef3736a65dfff7d0ae7f4c2182b96f789f20082 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 23 Feb 2021 18:51:03 +0100 Subject: [PATCH] up to 053 --- arch-libdir.patch | 6 +++--- dracut.spec | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch-libdir.patch b/arch-libdir.patch index 00c3eec..dfdf937 100644 --- a/arch-libdir.patch +++ b/arch-libdir.patch @@ -1,11 +1,11 @@ --- dracut-033/modules.d/95resume/module-setup.sh.orig 2013-09-15 18:27:32.700252837 +0200 +++ dracut-033/modules.d/95resume/module-setup.sh 2013-09-15 18:30:44.410244789 +0200 @@ -17,7 +17,7 @@ - install() { - local _bin + fi + # Optional uswsusp support - for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume + for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume do - [[ -x "${_bin}" ]] && { + [[ -x $dracutsysrootdir${_bin} ]] && { inst "${_bin}" /usr/sbin/resume diff --git a/dracut.spec b/dracut.spec index 342343d..5723bd7 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,12 +1,12 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 052 +Version: 053 Release: 1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: b6caff8ab83fbe0b3b5492553dfa154c +# Source0-md5: 57fef8076b74cae675eecf2245a98a5a Source1: pld.conf Patch0: plymouth-libdir.patch Patch1: os-release.patch @@ -468,6 +468,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/35network-legacy/*.sh %dir %{dracutlibdir}/modules.d/35network-manager %attr(755,root,root) %{dracutlibdir}/modules.d/35network-manager/*.sh +%{dracutlibdir}/modules.d/35network-manager/nm-run.service %dir %{dracutlibdir}/modules.d/35network-wicked %attr(755,root,root) %{dracutlibdir}/modules.d/35network-wicked/*.sh %dir %{dracutlibdir}/modules.d/40network -- 2.43.0