sys-kernel/dracut: Version bump to 013 and EAPI bump to 4.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

2 files changed, 104 insertions, 0 deletions

diff --git a/sys-kernel/dracut/files/dracut-013-livenet-gentoo-ca-bundle-path.patch b/sys-kernel/dracut/files/dracut-013-livenet-gentoo-ca-bundle-path.patch
new file mode 100644
index 000000000000..ff84df1ec42f
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-013-livenet-gentoo-ca-bundle-path.patch
@@ -0,0 +1,80 @@
+From 09b08578edf50aaa2bbf8a95c4dc74af5663318a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 21 Aug 2011 12:44:31 +0200
+Subject: [PATCH 1/2] dracut-functions: new function: inst_any [-d dest] f1
+ [f2 [f3 ...]]
+
+---
+ dracut-functions |   28 ++++++++++++++++++++++++++++
+ 1 files changed, 28 insertions(+), 0 deletions(-)
+
+diff --git a/dracut-functions b/dracut-functions
+index d7f2e5f..43a6843 100755
+--- a/dracut-functions
++++ b/dracut-functions
+@@ -537,6 +537,34 @@ inst_hook() {
+     inst_simple "$3" "/lib/dracut/hooks/${1}/${2}${3##*/}"
+ }
+ 
++# install any of listed files
++#
++# If first argument is '-d' and second some destination path, first accessible
++# source is installed into this path, otherwise it will installed in the same
++# path as source.  If none of listed files was installed, function return 1.
++# On first successful installation it returns with 0 status.
++#
++# Example:
++#
++# inst_any -d /bin/foo /bin/bar /bin/baz
++#
++# Lets assume that /bin/baz exists, so it will be installed as /bin/foo in
++# initramfs.
++inst_any() {
++    local to f
++
++    [[ $1 = '-d' ]] && to="$2" && shift 2
++
++    for f in "$@"; do
++        if [[ -e $f ]]; then
++            [[ $to ]] && inst "$f" "$to" && return 0
++            inst "$f" && return 0
++        fi
++    done
++
++    return 1
++}
++
+ dracut_install() {
+     local _optional=no
+     if [[ $1 = '-o' ]]; then
+-- 
+1.7.6
+
+From 40bdddfdcf02f0c48ae73ead237589d65a39bb6a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 21 Aug 2011 12:45:45 +0200
+Subject: [PATCH 2/2] livenet: take into account other ca-bundle paths; use
+ inst_any for that
+
+---
+ modules.d/90livenet/module-setup.sh |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90livenet/module-setup.sh b/modules.d/90livenet/module-setup.sh
+index 3ae72de..b166859 100755
+--- a/modules.d/90livenet/module-setup.sh
++++ b/modules.d/90livenet/module-setup.sh
+@@ -15,7 +15,9 @@ depends() {
+ install() {
+     dracut_install wget
+     mkdir -m 0755 -p "$initdir/etc/ssl/certs"
+-    if ! inst_simple /etc/ssl/certs/ca-bundle.crt; then
++    if ! inst_any -t /etc/ssl/certs/ca-bundle.crt \
++            /etc/ssl/certs/ca-bundle.crt \
++            /etc/ssl/certs/ca-certificates.crt; then
+         dwarn "Couldn't find SSL CA cert bundle; HTTPS won't work."
+     fi
+ 
+-- 
+1.7.6
+
diff --git a/sys-kernel/dracut/files/dracut-013-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-013-multipath-udev-rules.patch
new file mode 100644
index 000000000000..2b9cffad38c4
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-013-multipath-udev-rules.patch
@@ -0,0 +1,24 @@
+From 7f3e0c13f1c10e93c3823b6367f9ac83865f3d90 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Fri, 25 Feb 2011 01:44:25 +0100
+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 f78517c..3f4f612 100755
+--- a/modules.d/90multipath/module-setup.sh
++++ b/modules.d/90multipath/module-setup.sh
+@@ -58,6 +58,6 @@ install() {
+ 
+     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
+     inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
+-    inst_rules 40-multipath.rules
++    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
+ }
+ 
+-- 
+1.7.4.1
+