Fixes bug #428142 in 019 and 022.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

7 files changed, 132 insertions, 9 deletions

diff --git a/sys-kernel/dracut/files/019-0001-multipath-udev-rules.patch b/sys-kernel/dracut/files/019-0001-90multipath-added-kpartx.rules-multipa.patch
index 8268189ce58a..62d1b44242e6 100644
--- a/sys-kernel/dracut/files/019-0001-multipath-udev-rules.patch
+++ b/sys-kernel/dracut/files/019-0001-90multipath-added-kpartx.rules-multipa.patch
@@ -1,8 +1,8 @@
-From 6b237d3517701c96b852d00682d48548b56a97d2 Mon Sep 17 00:00:00 2001
+From 03d8ef0c6d58573d7a1bbc86fce490324ddd6725 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sat, 9 Jun 2012 14:18:56 +0200
-Subject: [PATCH] 90multipath: added kpartx.rules; multipath.rules - different
- prefix
+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 +-
diff --git a/sys-kernel/dracut/files/019-0002-no-pkg-config-warnings.patch b/sys-kernel/dracut/files/019-0002-Avoid-annonying-warnings-when-pkg-conf.patch
index 56199512b54b..0acd439e30c7 100644
--- a/sys-kernel/dracut/files/019-0002-no-pkg-config-warnings.patch
+++ b/sys-kernel/dracut/files/019-0002-Avoid-annonying-warnings-when-pkg-conf.patch
@@ -1,7 +1,8 @@
-From c84a602b412cbd3ac5a21a608046bf18b880f565 Mon Sep 17 00:00:00 2001
+From c3f0423502968bcee19f307cd2dfa6762a2e5ccf Mon Sep 17 00:00:00 2001
 From: Juan RP <xtraeme@gmail.com>
 Date: Wed, 6 Jun 2012 14:19:59 +0200
-Subject: [PATCH] Avoid annonying warnings when pkg-config is not installed.
+Subject: [PATCH 2/5] Avoid annonying warnings when pkg-config is not
+ installed.
 
 ---
  dracut-functions.sh                    |    2 +-
diff --git a/sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch b/sys-kernel/dracut/files/019-0003-99shutdown-remove-no-wall-argument-for.patch
index 35a6751fbdf5..49392bc18fdf 100644
--- a/sys-kernel/dracut/files/019-0017-99shutdown-remove-no-wall-argument-for.patch
+++ b/sys-kernel/dracut/files/019-0003-99shutdown-remove-no-wall-argument-for.patch
@@ -1,8 +1,8 @@
-From dd3517f38302f6e55b3cba13ec764166163be541 Mon Sep 17 00:00:00 2001
+From 7b565af4f41615bad43f710514a4f8fb9d2d2721 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...
+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.
diff --git a/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch b/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch
new file mode 100644
index 000000000000..5b6cd1c84982
--- /dev/null
+++ b/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch
@@ -0,0 +1,35 @@
+From a2540ba4d2f6a943a957775ac9a14f9207df1860 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.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
+
diff --git a/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch b/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch
new file mode 100644
index 000000000000..71c38219bc30
--- /dev/null
+++ b/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch
@@ -0,0 +1,28 @@
+From 7c687607133e1e58a601ad328898daec4bb41f3e Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.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
+
diff --git a/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch b/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch
new file mode 100644
index 000000000000..9a8e3b824a35
--- /dev/null
+++ b/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch
@@ -0,0 +1,31 @@
+From f5e10c1e3911a1cdc928fa0e4ab9bf775e9bac30 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.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
+
diff --git a/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch b/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch
new file mode 100644
index 000000000000..319e85aa8898
--- /dev/null
+++ b/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch
@@ -0,0 +1,28 @@
+From 8156e70294a911c0dc2c762f925bf544354763df Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.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
+