[gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: 019-0001-multipath-udev-rules.patch 022-0017-99shutdown-remove-no-wall-argument-for.patch 019-0017-99shutdown-remove-no-wall-argument-for.patch 019-0002-no-pkg-config-warnings.patch dracut-019-multipath-udev-rules.patch dracut-019-no-pkg-config-warnings.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     12/07/31 09:24:39

  Added:                019-0001-multipath-udev-rules.patch
                        022-0017-99shutdown-remove-no-wall-argument-for.patch
                        019-0017-99shutdown-remove-no-wall-argument-for.patch
                        019-0002-no-pkg-config-warnings.patch
  Removed:              dracut-019-multipath-udev-rules.patch
                        dracut-019-no-pkg-config-warnings.patch
  Log:
  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)

Revision  Changes    Path
1.1                  sys-kernel/dracut/files/019-0001-multipath-udev-rules.patch

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

Index: 019-0001-multipath-udev-rules.patch
===================================================================
From 6b237d3517701c96b852d00682d48548b56a97d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
Date: Sat, 9 Jun 2012 14:18:56 +0200
Subject: [PATCH] 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 bf71fdc..67d6068 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -72,6 +72,6 @@ install() {
 
     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
     inst_hook cleanup   02 "$moddir/multipathd-stop.sh"
-    inst_rules 40-multipath.rules
+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
 }
 
-- 
1.7.8.6




1.1                  sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch?rev=1.1&content-type=text/plain

Index: 022-0017-99shutdown-remove-no-wall-argument-for.patch
===================================================================
From dd3517f38302f6e55b3cba13ec764166163be541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <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




1.1                  sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch?rev=1.1&content-type=text/plain

Index: 019-0017-99shutdown-remove-no-wall-argument-for.patch
===================================================================
From dd3517f38302f6e55b3cba13ec764166163be541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <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




1.1                  sys-kernel/dracut/files/019-0002-no-pkg-config-warnings.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0002-no-pkg-config-warnings.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0002-no-pkg-config-warnings.patch?rev=1.1&content-type=text/plain

Index: 019-0002-no-pkg-config-warnings.patch
===================================================================
From c84a602b412cbd3ac5a21a608046bf18b880f565 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@×××××.com>
Date: Wed, 6 Jun 2012 14:19:59 +0200
Subject: [PATCH] Avoid annonying warnings when pkg-config is not installed.

---
 dracut-functions.sh                    |    2 +-
 modules.d/95udev-rules/module-setup.sh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dracut-functions.sh b/dracut-functions.sh
index f788878..4180f03 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -531,7 +531,7 @@ inst_symlink() {
     ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target"
 }
 
-udevdir=$(pkg-config udev --variable=udevdir)
+udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null)
 if ! [[ -d "$udevdir" ]]; then
     [[ -d /lib/udev ]] && udevdir=/lib/udev
     [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index e8c1c04..ff47021 100755
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -5,13 +5,13 @@
 install() {
     local _i
 
-    systemdutildir=$(pkg-config systemd --variable=systemdutildir)
+    systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
     if ! [[ -d "$systemdutildir" ]]; then
         [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
         [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
     fi
 
-    udevdir=$(pkg-config udev --variable=udevdir)
+    udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null)
     if ! [[ -d "$udevdir" ]]; then
         [[ -d /lib/udev ]] && udevdir=/lib/udev
         [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
-- 
1.7.8.6