- updated for 044

[packages/dracut.git] / misc_fixes.patch

diff --git a/misc_fixes.patch b/misc_fixes.patch
index 52cc803639a6f0331a0d5081c7fdffee46abf832..9617e60ca332be1a5a1529dc726fd57fa3e2f7b5 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
+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 @@
          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 -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 @@
+     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
+ }