diff options
| author |   Lance Albertson <ramereth@gentoo.org> | 2010-07-07 05:32:16 +0000 |
|---|---|---|
| committer | Lance Albertson <ramereth@gentoo.org> | 2010-07-07 05:32:16 +0000 |
| commit | 53e057b65e5828b87432d8e502a64bdc5a69d6fb (patch) | |
| tree | 17223ebba444c57a0cba1878bfe48aaa307519dc /sys-kernel/dracut/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-53e057b65e5828b87432d8e502a64bdc5a69d6fb.tar.gz gentoo-2-53e057b65e5828b87432d8e502a64bdc5a69d6fb.tar.bz2 gentoo-2-53e057b65e5828b87432d8e502a64bdc5a69d6fb.zip | |
Version bump, resolves bug #324705
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/dracut/files')
| -rw-r--r-- | sys-kernel/dracut/files/dracut-006-dhcp6.patch | 13 | ||||
| -rw-r--r-- | sys-kernel/dracut/files/dracut-006-lc-all-c.patch | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/sys-kernel/dracut/files/dracut-006-dhcp6.patch b/sys-kernel/dracut/files/dracut-006-dhcp6.patch new file mode 100644 index 000000000000..930dcae092ba --- /dev/null +++ b/sys-kernel/dracut/files/dracut-006-dhcp6.patch @@ -0,0 +1,13 @@ +diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh +index 7362669..a3c9597 100755 +--- a/modules.d/40network/parse-ip-opts.sh ++++ b/modules.d/40network/parse-ip-opts.sh +@@ -74,7 +74,7 @@ for p in $(getargs ip=); do + die "Sorry, automatic calculation of netmask is not yet supported" + ;; + auto6);; +- dhcp|on|any) \ ++ dhcp|dhcp6|on|any) \ + [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \ + die "Sorry, 'ip=$p' does not make sense for multiple interface configurations" + [ -n "$ip" ] && \ diff --git a/sys-kernel/dracut/files/dracut-006-lc-all-c.patch b/sys-kernel/dracut/files/dracut-006-lc-all-c.patch new file mode 100644 index 000000000000..4b13fb2367ae --- /dev/null +++ b/sys-kernel/dracut/files/dracut-006-lc-all-c.patch @@ -0,0 +1,13 @@ +diff --git a/dracut-functions b/dracut-functions +index 58f119f..2cd573a 100755 +--- a/dracut-functions ++++ b/dracut-functions +@@ -248,7 +248,7 @@ inst_binary() { + local LDSO NAME IO FILE ADDR I1 n f TLIBDIR + [[ -e $initdir$target ]] && return 0 + # I love bash! +- ldd $bin 2>/dev/null | while read line; do ++ LC_ALL=C ldd $bin 2>/dev/null | while read line; do + [[ $line = 'not a dynamic executable' ]] && return 1 + if [[ $line =~ not\ found ]]; then + derror "Missing a shared library required by $bin." |