Fixed bug #388199 in 019 and 022. 018 is ignored because it is going to be

removed soon. I have changed patches naming scheme in 019 as I did in 022.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

7 files changed, 82 insertions, 5 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 6bac9f84d1e5..89c7c65b7e81 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.75 2012/07/30 21:25:38 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.76 2012/07/31 09:24:38 aidecoe Exp $
+
+*dracut-022-r2 (31 Jul 2012)
+*dracut-019-r3 (31 Jul 2012)
+
+  31 Jul 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +files/019-0001-multipath-udev-rules.patch,
+  +files/019-0002-no-pkg-config-warnings.patch,
+  +files/019-0017-99shutdown-remove-no-wall-argument-for.patch,
+  +files/022-0017-99shutdown-remove-no-wall-argument-for.patch,
+  -dracut-019-r2.ebuild, +dracut-019-r3.ebuild,
+  -files/dracut-019-multipath-udev-rules.patch,
+  -files/dracut-019-no-pkg-config-warnings.patch, -dracut-022-r1.ebuild,
+  +dracut-022-r2.ebuild:
+  Fixed bug #388199 in 019 and 022. 018 is ignored because it is going to be
+  removed soon. I have changed patches naming scheme in 019 as I did in 022.
 
   30 Jul 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-022.ebuild:
   Remove old 022 revision.
diff --git a/sys-kernel/dracut/dracut-019-r2.ebuild b/sys-kernel/dracut/dracut-019-r3.ebuild
index 32a213f14457..8dde4ab9e666 100644
--- a/sys-kernel/dracut/dracut-019-r2.ebuild
+++ b/sys-kernel/dracut/dracut-019-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-019-r2.ebuild,v 1.3 2012/07/27 20:06:32 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-019-r3.ebuild,v 1.1 2012/07/31 09:24:38 aidecoe Exp $
 
 EAPI=4
 
@@ -144,8 +144,9 @@ base_sys_maj_ver() {
 #
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
-	epatch "${FILESDIR}/${P}-no-pkg-config-warnings.patch"
+	epatch "${FILESDIR}/${PV}-0001-multipath-udev-rules.patch"
+	epatch "${FILESDIR}/${PV}-0002-no-pkg-config-warnings.patch"
+	epatch "${FILESDIR}/${PV}-0017-99shutdown-remove-no-wall-argument-for.patch"
 }
 
 src_compile() {
diff --git a/sys-kernel/dracut/dracut-022-r1.ebuild b/sys-kernel/dracut/dracut-022-r2.ebuild
index ef66ff6b5dcd..c30b9e0fc189 100644
--- a/sys-kernel/dracut/dracut-022-r1.ebuild
+++ b/sys-kernel/dracut/dracut-022-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022-r1.ebuild,v 1.1 2012/07/30 20:26:31 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022-r2.ebuild,v 1.1 2012/07/31 09:24:38 aidecoe Exp $
 
 EAPI=4
 
@@ -156,6 +156,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-0014-parse-root-opts-first-check-for-ro-lat.patch"
 	epatch "${FILESDIR}/${PV}-0015-gentoo.conf-enable-ro_mnt.patch"
 	epatch "${FILESDIR}/${PV}-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch"
+	epatch "${FILESDIR}/${PV}-0017-99shutdown-remove-no-wall-argument-for.patch"
 	einfo "Removing ${S}/install/hashmap.o ..."
 	rm "${S}/install/hashmap.o" || die
 }
diff --git a/sys-kernel/dracut/files/dracut-019-multipath-udev-rules.patch b/sys-kernel/dracut/files/019-0001-multipath-udev-rules.patch
index 8268189ce58a..8268189ce58a 100644
--- a/sys-kernel/dracut/files/dracut-019-multipath-udev-rules.patch
+++ b/sys-kernel/dracut/files/019-0001-multipath-udev-rules.patch
diff --git a/sys-kernel/dracut/files/dracut-019-no-pkg-config-warnings.patch b/sys-kernel/dracut/files/019-0002-no-pkg-config-warnings.patch
index 56199512b54b..56199512b54b 100644
--- a/sys-kernel/dracut/files/dracut-019-no-pkg-config-warnings.patch
+++ b/sys-kernel/dracut/files/019-0002-no-pkg-config-warnings.patch
diff --git a/sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch b/sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch
new file mode 100644
index 000000000000..35a6751fbdf5
--- /dev/null
+++ b/sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch
@@ -0,0 +1,30 @@
+From dd3517f38302f6e55b3cba13ec764166163be541 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Tue, 31 Jul 2012 10:49:58 +0200
+Subject: [PATCH 17/17] 99shutdown: remove --no-wall argument for reboot,
+ halt, etc...
+
+In some distros (Gentoo, for example) these commands don't honor
+--no-wall argument.
+---
+ modules.d/99shutdown/shutdown.sh |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
+index aa0a81f..e1da91b 100755
+--- a/modules.d/99shutdown/shutdown.sh
++++ b/modules.d/99shutdown/shutdown.sh
+@@ -56,7 +56,7 @@ done
+ _check_shutdown final
+ 
+ getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"
+-[ "$1" = "reboot" ] && reboot -f -d -n --no-wall
+-[ "$1" = "poweroff" ] && poweroff -f -d -n --no-wall
+-[ "$1" = "halt" ] && halt -f -d -n --no-wall
++[ "$1" = "reboot" ] && reboot -f -d -n
++[ "$1" = "poweroff" ] && poweroff -f -d -n
++[ "$1" = "halt" ] && halt -f -d -n
+ [ "$1" = "kexec" ] && kexec -e
+-- 
+1.7.8.6
+
diff --git a/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch b/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch
new file mode 100644
index 000000000000..35a6751fbdf5
--- /dev/null
+++ b/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch
@@ -0,0 +1,30 @@
+From dd3517f38302f6e55b3cba13ec764166163be541 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Tue, 31 Jul 2012 10:49:58 +0200
+Subject: [PATCH 17/17] 99shutdown: remove --no-wall argument for reboot,
+ halt, etc...
+
+In some distros (Gentoo, for example) these commands don't honor
+--no-wall argument.
+---
+ modules.d/99shutdown/shutdown.sh |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
+index aa0a81f..e1da91b 100755
+--- a/modules.d/99shutdown/shutdown.sh
++++ b/modules.d/99shutdown/shutdown.sh
+@@ -56,7 +56,7 @@ done
+ _check_shutdown final
+ 
+ getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"
+-[ "$1" = "reboot" ] && reboot -f -d -n --no-wall
+-[ "$1" = "poweroff" ] && poweroff -f -d -n --no-wall
+-[ "$1" = "halt" ] && halt -f -d -n --no-wall
++[ "$1" = "reboot" ] && reboot -f -d -n
++[ "$1" = "poweroff" ] && poweroff -f -d -n
++[ "$1" = "halt" ] && halt -f -d -n
+ [ "$1" = "kexec" ] && kexec -e
+-- 
+1.7.8.6
+