[gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: dracut-008-dm-udev-rules.patch dracut-008-i18n-config-file-parsing-in-hostonly.patch dracut-008-multipath-udev-rules.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     11/03/01 01:59:53

  Added:                dracut-008-dm-udev-rules.patch
                        dracut-008-i18n-config-file-parsing-in-hostonly.patch
                        dracut-008-multipath-udev-rules.patch
  Log:
  sys-kernel/dracut:  Version bump to 008, resolves bug #353577
  
  (Portage version: 2.1.9.41/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch?rev=1.1&content-type=text/plain

Index: dracut-008-dm-udev-rules.patch
===================================================================
From 08b94155141151123737ff72a8cdd9c818de2e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
Date: Sat, 26 Feb 2011 08:08:37 +0100
Subject: [PATCH 2/2] Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install rules:

  10-dm.rules
  11-dm-lvm.rules
  13-dm-disk.rules
  95-dm-notify.rules

but provides only 64-device-mapper.rules combining more or less the
above rules files.
---
 modules.d/90dm/module-setup.sh     |    3 +++
 modules.d/90dmraid/module-setup.sh |    3 +++
 modules.d/90lvm/module-setup.sh    |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh
index 11985fd..67b4d40 100755
--- a/modules.d/90dm/module-setup.sh
+++ b/modules.d/90dm/module-setup.sh
@@ -22,5 +22,8 @@ install() {
 
     type -P dmeventd >/dev/null && dracut_install dmeventd
     inst_rules 10-dm.rules 95-dm-notify.rules
+    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
+    # files, but provides the one below:
+    inst_rules 64-device-mapper.rules
 }
 
diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
index f437712..6950d3c 100755
--- a/modules.d/90dmraid/module-setup.sh
+++ b/modules.d/90dmraid/module-setup.sh
@@ -43,6 +43,9 @@ install() {
     done
 
     inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 
+    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
+    # files, but provides the one below:
+    inst_rules 64-device-mapper.rules
 
     inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index 2555728..f3da242 100755
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -47,6 +47,9 @@ install() {
     fi
 
     inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 11-dm-lvm.rules
+    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
+    # files, but provides the one below:
+    inst_rules 64-device-mapper.rules
 
     inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
     inst_hook cmdline 30 "$moddir/parse-lvm.sh"
-- 
1.7.4.1




1.1                  sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch?rev=1.1&content-type=text/plain

Index: dracut-008-i18n-config-file-parsing-in-hostonly.patch
===================================================================
From ebaed7d51f61d331d128037e0b37130c58e957e3 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@××××××.com>
Date: Fri, 18 Feb 2011 09:33:06 +0100
Subject: [PATCH 07/22] i18n: fixed config file parsing in hostonly mode

I accidently removed some parenthesis.
---
 modules.d/10i18n/module-setup.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index a524d2d..57a0f9a 100755
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -68,10 +68,10 @@ install() {
 
         for item in $@
         do
-            item=${item/:/ }
+            item=(${item/:/ })
             for map in ${item[1]//,/ }
             do
-                map=${map//-/ }
+                map=(${map//-/ })
                 value=$(grep "^${map[0]}=" "${item[0]}")
                 value=${value#*=}
                 echo "${map[1]:-${map[0]}}=${value}"
-- 
1.7.4.1




1.1                  sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch?rev=1.1&content-type=text/plain

Index: dracut-008-multipath-udev-rules.patch
===================================================================
From b9ffb4f62109670c84de6ab4ccf53c8f25c20ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
Date: Fri, 25 Feb 2011 01:44:25 +0100
Subject: [PATCH 1/2] 90multipath: added kpartx.rules; multipath.rules - different prefix

---
 modules.d/90multipath/module-setup.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index f78517c..3f4f612 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -58,6 +58,6 @@ install() {
 
     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
     inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
-    inst_rules 40-multipath.rules
+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
 }
 
-- 
1.7.4.1