diff options
author | 2012-02-29 18:22:09 +0000 | |
---|---|---|
committer | 2012-02-29 18:22:09 +0000 | |
commit | e2de9149b12c2c07b678af53e5c3b34fdae9c2b8 (patch) | |
tree | 77788496427a3c09b46b790ab192f0ac7eea3794 /sys-kernel/dracut/files | |
parent | sys-kernel/dracut: Version bump to 017. Rels bug #406023 and bug #405921. (diff) | |
download | gentoo-2-e2de9149b12c2c07b678af53e5c3b34fdae9c2b8.tar.gz gentoo-2-e2de9149b12c2c07b678af53e5c3b34fdae9c2b8.tar.bz2 gentoo-2-e2de9149b12c2c07b678af53e5c3b34fdae9c2b8.zip |
sys-kernel/dracut: Removed old versions.
Left 014 because it is most stable and 017 because this is the latest with
important fixes.
(Portage version: 2.1.10.48/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/dracut/files')
9 files changed, 0 insertions, 310 deletions
diff --git a/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch b/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch deleted file mode 100644 index e3cfc1227f47..000000000000 --- a/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9aa83aa66ab6d31f30ed4d25a39b1ece067e0453 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Sat, 2 Apr 2011 00:39:38 +0200 -Subject: [PATCH] dracut: don't fail on empty /etc/ld.so.conf.d/ - ---- - dracut | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/dracut b/dracut -index c6605bb..15a5ee5 100755 ---- a/dracut -+++ b/dracut -@@ -524,7 +524,9 @@ done - unset item - - # make sure that library links are correct and up to date --dracut_install /etc/ld.so.conf /etc/ld.so.conf.d/* -+for f in /etc/ld.so.conf /etc/ld.so.conf.d/*; do -+ [[ -e $f ]] && dracut_install "$f" -+done - if ! ldconfig -r "$initdir"; then - if [[ $UID = 0 ]]; then - derror "ldconfig exited ungracefully" --- -1.7.4.1 - diff --git a/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch deleted file mode 100644 index 2b9cffad38c4..000000000000 --- a/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - diff --git a/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch b/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch deleted file mode 100644 index 3a036d7655d8..000000000000 --- a/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 969a4a6b82cfe36fada9c3813ef81cb3641863af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Thu, 30 Jun 2011 22:43:34 +0200 -Subject: [PATCH 2/2] 90kernel-modules: fixed handling rd.driver.post= - -Conflicts: - - modules.d/90kernel-modules/insmodpost.sh ---- - modules.d/90kernel-modules/insmodpost.sh | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/modules.d/90kernel-modules/insmodpost.sh b/modules.d/90kernel-modules/insmodpost.sh -index c3d7714..168a907 100755 ---- a/modules.d/90kernel-modules/insmodpost.sh -+++ b/modules.d/90kernel-modules/insmodpost.sh -@@ -2,11 +2,13 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - --for p in $(getargs rd.driver.post rdinsmodpost=); do -+. /lib/dracut-lib.sh -+ -+for modlist in $(getargs rd.driver.post rdinsmodpost=); do - ( - IFS=, -- for p in $i; do -- modprobe $p -+ for m in $modlist; do -+ modprobe $m - done - ) - done --- -1.7.5.3 - diff --git a/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch b/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch deleted file mode 100644 index 58d4287e5309..000000000000 --- a/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ce09d0ea4ddf01076453de6dde6f86cf6f12113d Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Fri, 6 May 2011 12:06:20 +0200 -Subject: [PATCH 1/2] parse-kernel.sh: wrong index was used in for loop - -Thanks Mike Snitzer <msnitzer@redhat.com> ---- - modules.d/90kernel-modules/parse-kernel.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh -index fceccaa..9323d42 100755 ---- a/modules.d/90kernel-modules/parse-kernel.sh -+++ b/modules.d/90kernel-modules/parse-kernel.sh -@@ -2,7 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - --for p in $(getargs rd.driver.pre rdloaddriver=); do -+for i in $(getargs rd.driver.pre rdloaddriver=); do - ( - IFS=, - for p in $i; do -@@ -11,7 +11,7 @@ for p in $(getargs rd.driver.pre rdloaddriver=); do - ) - done - --for p in $(getargs rd.driver.blacklist rdblacklist=); do -+for i in $(getargs rd.driver.blacklist rdblacklist=); do - ( - IFS=, - for p in $i; do --- -1.7.5.3 - diff --git a/sys-kernel/dracut/files/dracut-013-integrated-initramfs-fix.patch b/sys-kernel/dracut/files/dracut-013-integrated-initramfs-fix.patch deleted file mode 100644 index df41f00253c6..000000000000 --- a/sys-kernel/dracut/files/dracut-013-integrated-initramfs-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1a553e2bc9f3157cdd6957ab55dfc4b62d82dec6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Sun, 4 Sep 2011 16:30:39 +0200 -Subject: [PATCH] dracut: create /dev besides /proc, /sys and so - -How it worked without it? The issue only manifests itself with -initramfs integrated into kernel. ---- - dracut | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/dracut b/dracut -index fd36805..b317d70 100755 ---- a/dracut -+++ b/dracut -@@ -510,7 +510,7 @@ if [[ $kernel_only != yes ]]; then - fi - done - -- for d in proc sys sysroot root run run/lock run/initramfs; do -+ for d in dev proc sys sysroot root run run/lock run/initramfs; do - if [ -h "/$d" ]; then - inst "/$d" - else --- -1.7.6.1 - 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 deleted file mode 100644 index ff84df1ec42f..000000000000 --- a/sys-kernel/dracut/files/dracut-013-livenet-gentoo-ca-bundle-path.patch +++ /dev/null @@ -1,80 +0,0 @@ -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-makefile-manpages.patch b/sys-kernel/dracut/files/dracut-013-makefile-manpages.patch deleted file mode 100644 index d55802eb357f..000000000000 --- a/sys-kernel/dracut/files/dracut-013-makefile-manpages.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2cc392f32c86b1a603d4b07ea20e25e209113e47 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Wed, 16 Nov 2011 15:16:07 +0100 -Subject: [PATCH] Makefile: Append target files names for man pages. - ---- - Makefile | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 80173a3..454cd8e 100644 ---- a/Makefile -+++ b/Makefile -@@ -40,11 +40,11 @@ install: doc - install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions - install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger - cp -arx modules.d $(DESTDIR)$(pkglibdir) -- install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8 -- install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8 -- install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8 -- install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5 -- install -m 0644 dracut.kernel.7 $(DESTDIR)$(mandir)/man7 -+ install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8 -+ install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8 -+ install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8 -+ install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5 -+ install -m 0644 dracut.kernel.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7 - - clean: - $(RM) *~ --- -1.7.8.rc1 - diff --git a/sys-kernel/dracut/files/dracut-013-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-013-multipath-udev-rules.patch deleted file mode 100644 index 2b9cffad38c4..000000000000 --- a/sys-kernel/dracut/files/dracut-013-multipath-udev-rules.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - diff --git a/sys-kernel/dracut/files/dracut-016-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-016-multipath-udev-rules.patch deleted file mode 100644 index 2b9cffad38c4..000000000000 --- a/sys-kernel/dracut/files/dracut-016-multipath-udev-rules.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - |