]> TLD Linux GIT Repositories - packages/dracut.git/blob - misc_fixes.patch
- silence lvm during module setup
[packages/dracut.git] / misc_fixes.patch
1 diff -urN dracut-037.orig/modules.d/95terminfo/module-setup.sh dracut-037/modules.d/95terminfo/module-setup.sh
2 --- dracut-037.orig/modules.d/95terminfo/module-setup.sh        2014-03-19 16:16:08.000000000 +0000
3 +++ dracut-037/modules.d/95terminfo/module-setup.sh     2014-05-17 11:39:22.293000002 +0000
4 @@ -13,7 +13,9 @@
5      if [ -d ${_terminfodir} ]; then
6          for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do
7              inst_dir "$_terminfodir/${i%/*}"
8 -            cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
9 +            if [ -f "${initdir}/${_terminfodir}/${i%/*}" ]; then
10 +                cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
11 +            fi
12          done
13      fi
14  }
15 diff -ur dracut-043.orig/modules.d/90lvm/module-setup.sh dracut-043/modules.d/90lvm/module-setup.sh
16 --- dracut-043.orig/modules.d/90lvm/module-setup.sh     2015-06-15 10:27:21.000000000 +0000
17 +++ dracut-043/modules.d/90lvm/module-setup.sh  2015-08-08 22:11:29.854825069 +0000
18 @@ -73,9 +73,9 @@
19          if [ -f /etc/lvm/lvmlocal.conf ]; then
20              inst_simple -H /etc/lvm/lvmlocal.conf
21          fi
22 -        eval $(lvm dumpconfig global/system_id_source)
23 +        eval $(lvm dumpconfig global/system_id_source 2>/dev/null)
24          if [ "$system_id_source" == "file" ]; then
25 -            eval $(lvm dumpconfig global/system_id_file)
26 +            eval $(lvm dumpconfig global/system_id_file 2>/dev/null)
27              if [ -f "$system_id_file" ]; then
28                  inst_simple -H $system_id_file
29              fi