- updated to 0.47, partial PLD merge

[packages/dracut.git] / misc_fixes.patch

diff --git a/misc_fixes.patch b/misc_fixes.patch
index 9617e60ca332be1a5a1529dc726fd57fa3e2f7b5..be00a69b350ac8e3bbc698fc560f82872c31520c 100644 (file)
--- a/misc_fixes.patch
+++ b/misc_fixes.patch
@@ -1,7 +1,7 @@
-diff -ur dracut-044.orig/modules.d/90lvm/module-setup.sh dracut-044/modules.d/90lvm/module-setup.sh
---- dracut-044.orig/modules.d/90lvm/module-setup.sh    2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/90lvm/module-setup.sh 2015-11-30 13:03:04.369305000 +0000
-@@ -73,9 +73,9 @@
+diff -urpa dracut-047.orig/modules.d/90lvm/module-setup.sh dracut-047/modules.d/90lvm/module-setup.sh
+--- dracut-047.orig/modules.d/90lvm/module-setup.sh    2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/90lvm/module-setup.sh 2018-03-15 12:12:46.548976493 +0000
+@@ -73,9 +73,9 @@ install() {
          if [ -f /etc/lvm/lvmlocal.conf ]; then
              inst_simple -H /etc/lvm/lvmlocal.conf
          fi
@@ -13,16 +13,16 @@ diff -ur dracut-044.orig/modules.d/90lvm/module-setup.sh dracut-044/modules.d/90
              if [ -f "$system_id_file" ]; then
                  inst_simple -H $system_id_file
              fi
-diff -ur dracut-044.orig/modules.d/95terminfo/module-setup.sh dracut-044/modules.d/95terminfo/module-setup.sh
---- dracut-044.orig/modules.d/95terminfo/module-setup.sh       2015-11-25 13:22:28.000000000 +0000
-+++ dracut-044/modules.d/95terminfo/module-setup.sh    2015-11-30 13:01:38.196305000 +0000
-@@ -11,7 +11,9 @@
+diff -urpa dracut-047.orig/modules.d/95terminfo/module-setup.sh dracut-047/modules.d/95terminfo/module-setup.sh
+--- dracut-047.orig/modules.d/95terminfo/module-setup.sh       2018-02-19 09:00:33.000000000 +0000
++++ dracut-047/modules.d/95terminfo/module-setup.sh    2018-03-15 12:16:03.615974274 +0000
+@@ -11,7 +11,9 @@ install() {
      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"
+-            $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
 +            if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then
-+                cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
++                $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
 +            fi
          done
      fi