[gentoo-commits] gentoo-x86 commit in sys-kernel/dracut/files: 019-0005-dracut.sh-create-relative-symlinks-for.patch 022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch 019-0002-Avoid-annonying-warnings-when-pkg-conf.patch 022-0019-dracut.sh-create-relative-symlinks-for.patch 019-0003-99shutdown-remove-no-wall-argument-for.patch 019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch 019-0001-90multipath-added-kpartx.rules-multipa.patch 019-0017-99shutdown-remove-no-wall-argument-for.patch 019-0002-no-pkg-config-warnings.patch 019-0001-multipath-udev-rules.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     12/07/31 16:52:23

  Added:               
                        019-0005-dracut.sh-create-relative-symlinks-for.patch
                        022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch
                        019-0002-Avoid-annonying-warnings-when-pkg-conf.patch
                        022-0019-dracut.sh-create-relative-symlinks-for.patch
                        019-0003-99shutdown-remove-no-wall-argument-for.patch
                        019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch
                        019-0001-90multipath-added-kpartx.rules-multipa.patch
  Removed:             
                        019-0017-99shutdown-remove-no-wall-argument-for.patch
                        019-0002-no-pkg-config-warnings.patch
                        019-0001-multipath-udev-rules.patch
  Log:
  Fixes bug #428142 in 019 and 022.
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch?rev=1.1&content-type=text/plain

Index: 019-0005-dracut.sh-create-relative-symlinks-for.patch
===================================================================
From 7c687607133e1e58a601ad328898daec4bb41f3e Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@××××××.com>
Date: Tue, 31 Jul 2012 11:48:03 +0200
Subject: [PATCH 5/5] dracut.sh: create relative symlinks for /var/lock and
 /var/run

---
 dracut.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dracut.sh b/dracut.sh
index 8a7cb01..49421f6 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -695,8 +695,8 @@ if [[ $kernel_only != yes ]]; then
         fi
     done
 
-    ln -sfn /run "$initdir/var/run"
-    ln -sfn /run/lock "$initdir/var/lock"
+    ln -sfn ../run "$initdir/var/run"
+    ln -sfn ../run/lock "$initdir/var/lock"
 else
     for d in lib "$libdir"; do
         [[ -e "${initdir}${prefix}/$d" ]] && continue
-- 
1.7.8.6




1.1                  sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch?rev=1.1&content-type=text/plain

Index: 022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch
===================================================================
From f5e10c1e3911a1cdc928fa0e4ab9bf775e9bac30 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@××××××.com>
Date: Tue, 31 Jul 2012 11:44:40 +0200
Subject: [PATCH 18/19] dracut.sh: do not copy /var/run and /var/lock from the
 system

https://bugs.gentoo.org/show_bug.cgi?id=428142

If /var/run and /var/lock are real directories, we would end up with:
var/lock/lock -> /run/lock
var/run/run -> /run
---
 dracut.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dracut.sh b/dracut.sh
index 2235e9a..91e510c 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -810,7 +810,7 @@ if [[ $prefix ]]; then
 fi
 
 if [[ $kernel_only != yes ]]; then
-    for d in usr/bin usr/sbin bin etc lib sbin tmp usr var var/log var/run var/lock $libdirs; do
+    for d in usr/bin usr/sbin bin etc lib sbin tmp usr var var/log $libdirs; do
         [[ -e "${initdir}${prefix}/$d" ]] && continue
         if [ -L "/$d" ]; then
             inst_symlink "/$d" "${prefix}/$d"
-- 
1.7.8.6




1.1                  sys-kernel/dracut/files/019-0002-Avoid-annonying-warnings-when-pkg-conf.patch

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

Index: 019-0002-Avoid-annonying-warnings-when-pkg-conf.patch
===================================================================
From c3f0423502968bcee19f307cd2dfa6762a2e5ccf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@×××××.com>
Date: Wed, 6 Jun 2012 14:19:59 +0200
Subject: [PATCH 2/5] 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




1.1                  sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch?rev=1.1&content-type=text/plain

Index: 022-0019-dracut.sh-create-relative-symlinks-for.patch
===================================================================
From 8156e70294a911c0dc2c762f925bf544354763df Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@××××××.com>
Date: Tue, 31 Jul 2012 11:48:03 +0200
Subject: [PATCH 19/19] dracut.sh: create relative symlinks for /var/lock and
 /var/run

---
 dracut.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dracut.sh b/dracut.sh
index 91e510c..dfe0f08 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -827,8 +827,8 @@ if [[ $kernel_only != yes ]]; then
         fi
     done
 
-    ln -sfn /run "$initdir/var/run"
-    ln -sfn /run/lock "$initdir/var/lock"
+    ln -sfn ../run "$initdir/var/run"
+    ln -sfn ../run/lock "$initdir/var/lock"
 else
     for d in lib "$libdir"; do
         [[ -e "${initdir}${prefix}/$d" ]] && continue
-- 
1.7.8.6




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

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0003-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-0003-99shutdown-remove-no-wall-argument-for.patch?rev=1.1&content-type=text/plain

Index: 019-0003-99shutdown-remove-no-wall-argument-for.patch
===================================================================
From 7b565af4f41615bad43f710514a4f8fb9d2d2721 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 3/5] 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-0004-dracut.sh-do-not-copy-var-run-and-var-.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch?rev=1.1&content-type=text/plain

Index: 019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch
===================================================================
From a2540ba4d2f6a943a957775ac9a14f9207df1860 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@××××××.com>
Date: Tue, 31 Jul 2012 11:44:40 +0200
Subject: [PATCH 4/5] dracut.sh: do not copy /var/run and /var/lock from the
 system

https://bugs.gentoo.org/show_bug.cgi?id=428142

If /var/run and /var/lock are real directories, we would end up with:
var/lock/lock -> /run/lock
var/run/run -> /run

Conflicts:

	dracut.sh
---
 dracut.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dracut.sh b/dracut.sh
index c9e412e..8a7cb01 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -678,7 +678,7 @@ if [[ $prefix ]]; then
 fi
 
 if [[ $kernel_only != yes ]]; then
-    for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log var/run var/lock; do
+    for d in usr/bin usr/sbin bin etc lib sbin tmp usr var var/log $libdirs; do
         [[ -e "${initdir}${prefix}/$d" ]] && continue
         if [ -L "/$d" ]; then
             inst_symlink "/$d" "${prefix}/$d"
-- 
1.7.8.6




1.1                  sys-kernel/dracut/files/019-0001-90multipath-added-kpartx.rules-multipa.patch

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

Index: 019-0001-90multipath-added-kpartx.rules-multipa.patch
===================================================================
From 03d8ef0c6d58573d7a1bbc86fce490324ddd6725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
Date: Thu, 26 Jul 2012 11:38:04 +0200
Subject: [PATCH 1/5] 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