From: Jan Rękorajski Date: Mon, 13 Oct 2014 18:01:22 +0000 (+0200) Subject: - fix path to keyctl tool X-Git-Tag: auto/th/dracut-038-2~1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fdracut.git;a=commitdiff_plain;h=ccf6ef49db16f1d3146c3822b2c6ec7427f1f0ec - fix path to keyctl tool --- diff --git a/dracut.spec b/dracut.spec index 59cbe2d..b0d6ef0 100644 --- a/dracut.spec +++ b/dracut.spec @@ -2,7 +2,7 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut Version: 038 -Release: 1 +Release: 1.1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz @@ -14,6 +14,7 @@ Patch3: plymouth-logo.patch Patch4: arch-libdir.patch Patch5: systemd-paths.patch Patch6: prelink-libs.patch +Patch7: keyctl-path.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: asciidoc BuildRequires: dash @@ -194,6 +195,7 @@ Bashowe dopełnianie składni dla polecenia dracut. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh diff --git a/keyctl-path.patch b/keyctl-path.patch new file mode 100644 index 0000000..f271cec --- /dev/null +++ b/keyctl-path.patch @@ -0,0 +1,11 @@ +--- dracut-038/modules.d/03modsign/module-setup.sh~ 2014-06-30 12:03:12.000000000 +0200 ++++ dracut-038/modules.d/03modsign/module-setup.sh 2014-10-13 19:59:05.689766678 +0200 +@@ -29,7 +29,7 @@ + # called by dracut + install() { + inst_dir /lib/modules/keys +- inst_binary /usr/bin/keyctl ++ inst_binary keyctl + + inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh" +