[dracut/f17] dracut-018-55.git20120611

Mon Jun 11 15:16:15 UTC 2012

commit 715c381b9ac465613832c1afc8662b2ce4521e68
Author: Harald Hoyer <harald at redhat.com>
Date:   Mon Jun 11 17:14:25 2012 +0200

    dracut-018-55.git20120611
    
    - default to dhcp for BOOTIF

 ...re-that-we-get-the-storage-modules-into-t.patch |    2 +-
 ...c-remove-typo-from-BuildRequires-for-suse.patch |   22 ++++++++++++++++
 ...les-module-setup.sh-include-omapdrm-in-th.patch |   23 +++++++++++++++++
 ...etwork-ifup.sh-default-to-dhcp-for-BOOTIF.patch |   27 ++++++++++++++++++++
 dracut.spec                                        |   10 ++++++-
 5 files changed, 81 insertions(+), 3 deletions(-)
---

diff --git a/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch b/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
index b28370d..5199d4a 100644
--- a/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
+++ b/0035-ARM-make-sure-that-we-get-the-storage-modules-into-t.patch
@@ -17,7 +17,7 @@ index 26f4784..fd8b92c 100755
          hostonly='' instmods usb_storage sdhci sdhci-pci
  
 +        # arm specific modules
-+        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap sdhci_dove ahci_platform pata_imx sata_mv omapdrm
++        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap sdhci_dove ahci_platform pata_imx sata_mv
 +
          # 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
diff --git a/0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch b/0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch
new file mode 100644
index 0000000..4520961
--- /dev/null
+++ b/0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch
@@ -0,0 +1,22 @@
+From 9cec52027c0af88b41f4058b50dc25ae47354c99 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 6 Jun 2012 10:24:07 +0200
+Subject: [PATCH] dracut.spec: remove typo from BuildRequires for suse
+
+---
+ dracut.spec |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.spec b/dracut.spec
+index b5218d9..38da76d 100644
+--- a/dracut.spec
++++ b/dracut.spec
+@@ -40,7 +40,7 @@ BuildRequires: docbook-style-xsl docbook-dtds libxslt
+ %endif
+ 
+ %if 0%{?suse_version}
+--BuildRequires: docbook-xsl-stylesheets libxslt
++BuildRequires: docbook-xsl-stylesheets libxslt
+ %endif
+ 
+ BuildRequires: asciidoc
diff --git a/0053-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch b/0053-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch
new file mode 100644
index 0000000..9634188
--- /dev/null
+++ b/0053-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch
@@ -0,0 +1,23 @@
+From 3888eff1eb5248f66f9ca971a26155bd4ccf417e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Wed, 6 Jun 2012 11:45:30 +0200
+Subject: [PATCH] kernel-modules/module-setup.sh: include omapdrm in the arm
+ modules to include
+
+---
+ modules.d/90kernel-modules/module-setup.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index fd8b92c..501088e 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -36,7 +36,7 @@ installkernel() {
+         hostonly='' instmods usb_storage sdhci sdhci-pci
+ 
+         # arm specific modules
+-        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap sdhci_dove ahci_platform pata_imx sata_mv
++        hostonly='' instmods sdhci_esdhc_imx mmci sdhci_tegra mvsdio omap omapdrm sdhci_dove ahci_platform pata_imx sata_mv
+ 
+         # 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
diff --git a/0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch b/0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
new file mode 100644
index 0000000..9af619d
--- /dev/null
+++ b/0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
@@ -0,0 +1,27 @@
+From 4d0cefe6684c33a4d260ab58bf69cafa20e3778d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 11 Jun 2012 17:11:49 +0200
+Subject: [PATCH] network/ifup.sh: default to dhcp for BOOTIF
+
+---
+ modules.d/40network/ifup.sh |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index b8f07f4..aebbbc3 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -202,6 +202,13 @@ if [ "$netif" = "$bridgename" ] && [ ! -e /tmp/net.$bridgename.up ]; then
+     brctl addif $bridgename $ethname
+ fi
+ 
++# BOOTIF= defaults to dhcpv4
++bootif=$(getargs BOOTIF=)
++if [ -n "$bootif" ] ; then
++    do_dhcp -4
++    exit 0
++fi
++
+ # Specific configuration, spin through the kernel command line
+ # looking for ip= lines
+ for p in $(getargs ip=); do
diff --git a/dracut.spec b/dracut.spec
index 28700dc..fd9920e 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 018
-Release: 53.git20120605%{?dist}
+Release: 55.git20120611%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -75,6 +75,9 @@ Patch48: 0048-dracut.sh-do-not-rely-on-the-presence-of-lib64-check.patch
 Patch49: 0049-Don-t-set-an-already-set-attribute-826357.patch
 Patch50: 0050-add-filesystem-options-to-fsck_single.patch
 Patch51: 0051-dasd_mod-change-rd.dasd-to-dasd_mod-kernel-parameter.patch
+Patch52: 0052-dracut.spec-remove-typo-from-BuildRequires-for-suse.patch
+Patch53: 0053-kernel-modules-module-setup.sh-include-omapdrm-in-th.patch
+Patch54: 0054-network-ifup.sh-default-to-dhcp-for-BOOTIF.patch
 
 
 BuildArch: noarch
@@ -92,7 +95,7 @@ BuildRequires: docbook-style-xsl docbook-dtds libxslt
 %endif
 
 %if 0%{?suse_version}
--BuildRequires: docbook-xsl-stylesheets libxslt
+BuildRequires: docbook-xsl-stylesheets libxslt
 %endif
 
 BuildRequires: asciidoc
@@ -390,6 +393,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Jun 11 2012 Harald Hoyer <harald at redhat.com> 018-55.git20120611
+- default to dhcp for BOOTIF
+
 * Tue Jun 05 2012 Dennis Gilmore <dennis at ausil.us> 018-53.git20120605
 - include omapdrm in the arm modules to include
 
