summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-08-03 13:54:46 +0000
committerRoy Marples <roy@marples.name>2007-08-03 13:54:46 +0000
commit9169c51d39ed17b98f6617f89fdf9d01723bff52 (patch)
treef2f522daf1374a573c823a731e3f13790cac70ce
parent65a9e4618baadff217dd36216b5c64f2ad66dfc6 (diff)
downloadopenrc-9169c51d39ed17b98f6617f89fdf9d01723bff52.tar.gz
openrc-9169c51d39ed17b98f6617f89fdf9d01723bff52.tar.bz2
openrc-9169c51d39ed17b98f6617f89fdf9d01723bff52.tar.xz
Fix adding multiple IP addresses, #187526.
-rw-r--r--ChangeLog3
-rw-r--r--net.BSD/ifconfig.sh11
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 08572d1..171b733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
03 Aug 2007; Roy Marples <uberlord@gentoo.org>:
+ Fix adding multiple IP addresses, #187526.
Fix static IPv6 routes, #187514.
* baselayout-2.0.0_rc1 (02 Aug 2007)
@@ -15,7 +16,7 @@
31 Jul 2007; Roy Marples <uberlord@gentoo.org>:
All our binaries are now multicalls into rc, which makes our on disk size
- a lot smaller.
+ a lot smaller.
23 Jul 2007; Roy Marples <uberlord@gentoo.org>:
diff --git a/net.BSD/ifconfig.sh b/net.BSD/ifconfig.sh
index 06be70c..92a7733 100644
--- a/net.BSD/ifconfig.sh
+++ b/net.BSD/ifconfig.sh
@@ -78,6 +78,12 @@ _get_inet_address() {
}
_add_address() {
+ local inet6=
+
+ case "$@" in
+ *:*) inet6=inet6 ;;
+ esac
+
if [ "${metric:-0}" != "0" ] ; then
set -- "$@" metric ${metric}
fi
@@ -94,10 +100,7 @@ _add_address() {
;;
esac
- case "$@" in
- *:*) ifconfig "${IFACE}" inet6 "$@" ;;
- *) ifconfig "${IFACE}" "$@" ;;
- esac
+ ifconfig "${IFACE}" ${inet6} alias "$@"
}
_add_route() {