[dracut/f17] dracut-018-98.git20120813

[Harald Hoyer]

commit aa1b08c0d2034bf07ba03bc01d637605609314a7
Author: Harald Hoyer <harald at redhat.com>
Date:   Mon Aug 13 10:53:07 2012 +0200

    dracut-018-98.git20120813
    
    - fixed keymap include issues
    Resolves: rhbz#845744

 ...18n-module-setup.sh-fixed-include-parsing.patch |   26 ++++++++++++++++++++
 ...0096-include-the-omap_hsmmc-module-on-arm.patch |    6 +---
 ...18n-module-setup.sh-fixed-include-parsing.patch |   26 ++++++++++++++++++++
 dracut.spec                                        |    9 +++++-
 4 files changed, 61 insertions(+), 6 deletions(-)
---
diff --git a/0096-i18n-module-setup.sh-fixed-include-parsing.patch b/0096-i18n-module-setup.sh-fixed-include-parsing.patch
new file mode 100644
index 0000000..e719133
--- /dev/null
+++ b/0096-i18n-module-setup.sh-fixed-include-parsing.patch
@@ -0,0 +1,26 @@
+From f72565841d1dfc4b5648a08f39bbb899d06b748c Mon Sep 17 00:00:00 2001
+From: Stefan Reimer <it at startux.de>
+Date: Tue, 31 Jul 2012 11:36:17 +0200
+Subject: [PATCH] i18n/module-setup.sh: fixed include parsing
+
+Due to bug in module-setup.sh in the i18n module includes from the main
+keymap are not working and not added to the initrd image.
+
+Only one quotation per line is removed. Needs to remove all.
+---
+ modules.d/10i18n/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index 6d44a69..7f15ad9 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -31,7 +31,7 @@ install() {
+             *) cmd=grep ;;
+         esac
+ 
+-        for INCL in $($cmd "^include " $MAP | while read a a b; do echo ${a/\"/}; done); do
++        for INCL in $($cmd "^include " $MAP | while read a a b; do echo ${a//\"/}; done); do
+             for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
+                 findkeymap $FN
+             done
diff --git a/0001-include-the-omap_hsmmc-module-on-arm.patch b/0096-include-the-omap_hsmmc-module-on-arm.patch
similarity index 89%
rename from 0001-include-the-omap_hsmmc-module-on-arm.patch
rename to 0096-include-the-omap_hsmmc-module-on-arm.patch
index 74cf0b7..bca2fcb 100644
--- a/0001-include-the-omap_hsmmc-module-on-arm.patch
+++ b/0096-include-the-omap_hsmmc-module-on-arm.patch
@@ -1,6 +1,6 @@
-From e0c1a5dc6b23b905590e4ba8876bf0b56709833f Mon Sep 17 00:00:00 2001
+From 0aa0745c796420405f5adb4454251f7f89b25f48 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis at ausil.us>
-Date: Thu, 2 Aug 2012 05:11:43 -0500
+Date: Thu, 2 Aug 2012 05:12:54 -0500
 Subject: [PATCH] include the omap_hsmmc module on arm
 
 ---
@@ -20,5 +20,3 @@ index 2999388..b053102 100755
  
          # install keyboard support
          hostonly='' instmods atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech hid-logitech-dj hid-microsoft ehci-hcd ohci-hcd uhci-hcd
---- 
-1.7.11.2
diff --git a/0097-i18n-module-setup.sh-fixed-include-parsing.patch b/0097-i18n-module-setup.sh-fixed-include-parsing.patch
new file mode 100644
index 0000000..40b7c7e
--- /dev/null
+++ b/0097-i18n-module-setup.sh-fixed-include-parsing.patch
@@ -0,0 +1,26 @@
+From 63845f8ff80688cd752c4f0a031d1672e72a064c Mon Sep 17 00:00:00 2001
+From: Stefan Reimer <it at startux.de>
+Date: Tue, 31 Jul 2012 11:36:17 +0200
+Subject: [PATCH] i18n/module-setup.sh: fixed include parsing
+
+Due to bug in module-setup.sh in the i18n module includes from the main
+keymap are not working and not added to the initrd image.
+
+Only one quotation per line is removed. Needs to remove all.
+---
+ modules.d/10i18n/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index 6d44a69..7f15ad9 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -31,7 +31,7 @@ install() {
+             *) cmd=grep ;;
+         esac
+ 
+-        for INCL in $($cmd "^include " $MAP | while read a a b; do echo ${a/\"/}; done); do
++        for INCL in $($cmd "^include " $MAP | while read a a b; do echo ${a//\"/}; done); do
+             for FN in $(find ${kbddir}/keymaps -type f -name $INCL\*); do
+                 findkeymap $FN
+             done
diff --git a/dracut.spec b/dracut.spec
index 7044ccf..a62f12a 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 97.git20120724%{?dist}
+Release: 98.git20120813%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -119,7 +119,8 @@ Patch92: 0092-udev-rules-module-setup.sh-cope-with-systemd-udevd.patch
 Patch93: 0093-Makefile-set-LC_MESSAGES-C-.-not-LANG.patch
 Patch94: 0094-resume-move-resume-in-the-initqueue-finished-hook.patch
 Patch95: 0095-lvm-lvm_scan.sh-udevadm-settle-after-lvm-scan.patch
-Patch96: 0001-include-the-omap_hsmmc-module-on-arm.patch
+Patch96: 0096-include-the-omap_hsmmc-module-on-arm.patch
+Patch97: 0097-i18n-module-setup.sh-fixed-include-parsing.patch
 
 
 BuildArch: noarch
@@ -435,6 +436,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Aug 13 2012 Harald Hoyer <harald at redhat.com> 018-98.git20120813
+- fixed keymap include issues
+Resolves: rhbz#845744
+
 * Wed Aug 01 2012 Dennis Gilmore <dennis at ausil.us> 018-97.git20120724
 - include omap_hsmmc on arm