- cosmetics

[packages/dracut.git] / misc_fixes.patch

diff --git a/misc_fixes.patch b/misc_fixes.patch
index 52cc803639a6f0331a0d5081c7fdffee46abf832..be00a69b350ac8e3bbc698fc560f82872c31520c 100644 (file)
--- a/misc_fixes.patch
+++ b/misc_fixes.patch
@@ -1,25 +1,11 @@
-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
- }
-diff -ur dracut-043.orig/modules.d/90lvm/module-setup.sh dracut-043/modules.d/90lvm/module-setup.sh
---- dracut-043.orig/modules.d/90lvm/module-setup.sh    2015-06-15 10:27:21.000000000 +0000
-+++ dracut-043/modules.d/90lvm/module-setup.sh 2015-08-08 22:11:29.854825069 +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
--        eval $(lvm dumpconfig global/system_id_source)
+-        eval $(lvm dumpconfig global/system_id_source &>/dev/null)
 +        eval $(lvm dumpconfig global/system_id_source 2>/dev/null)
          if [ "$system_id_source" == "file" ]; then
 -            eval $(lvm dumpconfig global/system_id_file)
@@ -27,3 +13,17 @@ diff -ur dracut-043.orig/modules.d/90lvm/module-setup.sh dracut-043/modules.d/90
              if [ -f "$system_id_file" ]; then
                  inst_simple -H $system_id_file
              fi
+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%/*}"
+-            $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
++            if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then
++                $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
++            fi
+         done
+     fi
+ }