From 49644e2a46c4c194641dea736023516b1d2c9d44 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 17 May 2014 12:58:27 +0000 Subject: [PATCH] - misc fixes --- dracut.spec | 6 ++++-- misc_fixes.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 misc_fixes.patch diff --git a/dracut.spec b/dracut.spec index 0895d74..0db48be 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: 037 -Release: 3 +Release: 4 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz @@ -15,7 +15,8 @@ Patch4: arch-libdir.patch Patch5: systemd-paths.patch Patch6: prelink-libs.patch Patch7: config.patch -Patch8: git.patch +Patch8: misc_fixes.patch +Patch100: git.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: asciidoc BuildRequires: dash @@ -198,6 +199,7 @@ Bashowe dopełnianie składni dla polecenia dracut. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch100 -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/misc_fixes.patch b/misc_fixes.patch new file mode 100644 index 0000000..8e7c5c1 --- /dev/null +++ b/misc_fixes.patch @@ -0,0 +1,14 @@ +diff -urN dracut-037.orig/modules.d/95terminfo/module-setup.sh dracut-037/modules.d/95terminfo/module-setup.sh +--- dracut-037.orig/modules.d/95terminfo/module-setup.sh 2014-03-19 16:16:08.000000000 +0000 ++++ dracut-037/modules.d/95terminfo/module-setup.sh 2014-05-17 11:39:22.293000002 +0000 +@@ -13,7 +13,9 @@ + if [ -d ${_terminfodir} ]; then + for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do + inst_dir "$_terminfodir/${i%/*}" +- cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" ++ if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then ++ cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" ++ fi + done + fi + } -- 2.46.0