[dracut/f18] dracut-024-4.git20121019

[Harald Hoyer]

commit 74fef9c8c4116fa8483da08c93c640cd71d32e2d
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Oct 19 11:14:22 2012 +0200

    dracut-024-4.git20121019
    
    - fix ifup exit code
    - fixed default "rd.auto" parameter setting

 ...dracut.sh-only-save-kernel_cmdline-if-set.patch |   22 +++++++++++
 ....d-fedora.conf.example-s-kernelcmdline-ke.patch |   22 +++++++++++
 ...fup.sh-do_static-and-do_ipv6auto-return-0.patch |   38 ++++++++++++++++++++
 dracut.spec                                        |    9 ++++-
 4 files changed, 90 insertions(+), 1 deletions(-)
---
diff --git a/0001-dracut.sh-only-save-kernel_cmdline-if-set.patch b/0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
new file mode 100644
index 0000000..691e3f7
--- /dev/null
+++ b/0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
@@ -0,0 +1,22 @@
+From 636e5cd2d53c8165a0dc5f857af643fd15faea9d Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 19 Oct 2012 11:09:38 +0200
+Subject: [PATCH] dracut.sh: only save $kernel_cmdline, if set
+
+---
+ dracut.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index e160641..aab850e 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -937,7 +937,7 @@ fi
+ if [[ $kernel_only != yes ]]; then
+     (( ${#install_items[@]} > 0 )) && dracut_install  ${install_items[@]}
+ 
+-    echo "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
++    [[ $kernel_cmdline ]] && echo "$kernel_cmdline" >> "${initdir}/etc/cmdline.d/01-default.conf"
+ 
+     while pop fstab_lines line; do
+         echo "$line 0 0" >> "${initdir}/etc/fstab"
diff --git a/0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch b/0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
new file mode 100644
index 0000000..5fe2d45
--- /dev/null
+++ b/0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
@@ -0,0 +1,22 @@
+From e743cfdd4bab527fa39e773be7dd48c8325c8eee Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Fri, 19 Oct 2012 11:10:03 +0200
+Subject: [PATCH] dracut.conf.d/fedora.conf.example:
+ s/kernelcmdline/kernel_cmdline
+
+---
+ dracut.conf.d/fedora.conf.example | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
+index ed6e5d9..487be79 100644
+--- a/dracut.conf.d/fedora.conf.example
++++ b/dracut.conf.d/fedora.conf.example
+@@ -11,4 +11,5 @@ systemdsystemunitdir=/usr/lib/systemd/system
+ udevdir=/usr/lib/udev
+ add_dracutmodules+=" systemd "
+ realinitpath="/usr/lib/systemd/systemd"
+-kernelcmdline+=" rd.auto=1 "
+\ No newline at end of file
++kernel_cmdline+=" rd.auto=1 "
++
diff --git a/0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch b/0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
new file mode 100644
index 0000000..7e4c1c9
--- /dev/null
+++ b/0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
@@ -0,0 +1,38 @@
+From 8bf25df6408af65a95318b967b6ca64ead643f0e Mon Sep 17 00:00:00 2001
+From: WANG Chao <chaowang at redhat.com>
+Date: Thu, 18 Oct 2012 16:43:28 +0800
+Subject: [PATCH] 40network/ifup.sh: do_static() and do_ipv6auto return 0 if
+ no errors.
+
+Commit a0be1ed removes some lines from do_static() and do_ipv6auto().
+
+When $hostname is empty, do_static() and do_ipv6auto() will return 1
+and fails to run setup_net at the last of ifup.sh
+
+Signed-off-by: WANG Chao <chaowang at redhat.com>
+---
+ modules.d/40network/ifup.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index 95289c9..db233de 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -88,6 +88,8 @@ do_ipv6auto() {
+     wait_for_if_up $netif
+ 
+     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
++
++    return 0
+ }
+ 
+ # Handle static ip configuration
+@@ -108,6 +110,8 @@ do_static() {
+ 
+     [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
+     [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
++
++    return 0
+ }
+ 
+ # loopback is always handled the same way
diff --git a/dracut.spec b/dracut.spec
index bdffaf6..611c014 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 024
-Release: 1%{?dist}
+Release: 4.git20121019%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -29,6 +29,9 @@ URL: https://dracut.wiki.kernel.org/
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
+Patch1: 0001-dracut.sh-only-save-kernel_cmdline-if-set.patch
+Patch2: 0002-dracut.conf.d-fedora.conf.example-s-kernelcmdline-ke.patch
+Patch3: 0003-40network-ifup.sh-do_static-and-do_ipv6auto-return-0.patch
 
 
 BuildRequires: dash bash git
@@ -362,6 +365,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Fri Oct 19 2012 Harald Hoyer <harald at redhat.com> 024-4.git20121019
+- fix ifup exit code
+- fixed default "rd.auto" parameter setting
+
 * Tue Oct 16 2012 Harald Hoyer <harald at redhat.com> 024-1
 - version 024
 - do not overwrite ifcfg from anaconda