- updated to 056

[packages/dracut.git] / misc_fixes.patch

diff --git a/misc_fixes.patch b/misc_fixes.patch
index be00a69b350ac8e3bbc698fc560f82872c31520c..5358ba7f4ebb1b2d91e910c8f9d52404e5a058ce 100644 (file)
--- a/misc_fixes.patch
+++ b/misc_fixes.patch
@@ -1,29 +1,30 @@
-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
+diff -urpa dracut-056.orig/modules.d/90lvm/module-setup.sh dracut-056/modules.d/90lvm/module-setup.sh
+--- dracut-056.orig/modules.d/90lvm/module-setup.sh    2022-02-18 12:32:53.000000000 +0100
++++ dracut-056/modules.d/90lvm/module-setup.sh 2022-08-28 19:15:35.294063140 +0200
+@@ -68,9 +68,9 @@ install() {
+         if [[ -f $dracutsysrootdir/etc/lvm/lvmlocal.conf ]]; then
              inst_simple -H /etc/lvm/lvmlocal.conf
          fi
--        eval $(lvm dumpconfig global/system_id_source &>/dev/null)
-+        eval $(lvm dumpconfig global/system_id_source 2>/dev/null)
+-        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)
-+            eval $(lvm dumpconfig global/system_id_file 2>/dev/null)
+-            eval "$(lvm dumpconfig global/system_id_file)"
++            eval "$(lvm dumpconfig global/system_id_file 2> /dev/null)"
              if [ -f "$system_id_file" ]; then
-                 inst_simple -H $system_id_file
+                 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
+diff -urpa dracut-056.orig/modules.d/95terminfo/module-setup.sh dracut-056/modules.d/95terminfo/module-setup.sh
+--- dracut-056.orig/modules.d/95terminfo/module-setup.sh       2022-02-18 12:32:53.000000000 +0100
++++ dracut-056/modules.d/95terminfo/module-setup.sh    2022-08-28 19:14:48.579968472 +0200
 @@ -11,7 +11,9 @@ install() {
-     if [ -d ${_terminfodir} ]; then
+     if [[ -d $dracutsysrootdir${_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"
+-            $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$dracutsysrootdir$_terminfodir/$i"
 +            if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then
-+                $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
++                $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$dracutsysrootdir$_terminfodir/$i"
 +            fi
          done
      fi
  }
+Only in dracut-056.orig/modules.d/99base: init.sh.rej