Compare commits

..

4 Commits

Author SHA1 Message Date
Robin H. Johnson
e4ce98b3b4 Bugfix release, tracker bug #401555. 2012-01-30 19:54:55 +00:00
Robin H. Johnson
04e6696782 Bump minor version. 2012-01-25 10:46:58 -08:00
Robin H. Johnson
85193674da net/bonding: Fix which interface IPs get added to.
The previous bonding change of ensuring interfaces were down to add
slave interfaces, but it clobbered the IFACE variable, because it was
being passed to a bash function rather than a command.

Cherry-picked from master/c92f0ab702.

X-Gentoo-Bug: 400613
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400613
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2012-01-25 10:46:25 -08:00
Robin H. Johnson
a73c26a70b net/ethtool: Fix program call.
I missed removing a call to the old ethtool function wrapper that was
made unneeded by commit d02d3af02.

Cherry-picked from master/fdc8849e.

X-Gentoo-Bug: 399037
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=399037
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2012-01-25 10:38:09 -08:00
3 changed files with 10 additions and 4 deletions

View File

@@ -1,3 +1,3 @@
NAME= openrc NAME= openrc
VERSION= 0.9.8.1 VERSION= 0.9.8.3
PKG= ${NAME}-${VERSION} PKG= ${NAME}-${VERSION}

View File

@@ -102,15 +102,21 @@ bonding_pre_start()
eoutdent eoutdent
if [ -d /sys/class/net ]; then if [ -d /sys/class/net ]; then
sys_bonding_path=/sys/class/net/"${IFACE}"/bonding sys_bonding_path=/sys/class/net/"${IFACE}"/bonding
local oiface
oiface=$IFACE
if [ -n "${primary}" ]; then if [ -n "${primary}" ]; then
IFACE=$primary _down IFACE=$primary
_down
IFACE=$oiface
echo "+${primary}" >$sys_bonding_path/slaves echo "+${primary}" >$sys_bonding_path/slaves
echo "${primary}" >$sys_bonding_path/primary echo "${primary}" >$sys_bonding_path/primary
fi fi
for s in ${slaves}; do for s in ${slaves}; do
[ "${s}" = "${primary}" ] && continue [ "${s}" = "${primary}" ] && continue
if ! grep -q ${s} $sys_bonding_path/slaves; then if ! grep -q ${s} $sys_bonding_path/slaves; then
IFACE=$s _down IFACE=$s
_down
IFACE=$oiface
echo "+${s}" >$sys_bonding_path/slaves echo "+${s}" >$sys_bonding_path/slaves
fi fi
done done

View File

@@ -39,7 +39,7 @@ ethtool_pre_start() {
args_pretty="--${opt} $IFACE ${args_pretty}" args_pretty="--${opt} $IFACE ${args_pretty}"
args="--${opt} $IFACE ${args}" args="--${opt} $IFACE ${args}"
ebegin "ethtool ${args_pretty}" ebegin "ethtool ${args_pretty}"
$(_ethtool) ${args} ethtool ${args}
rc=$? rc=$?
eend $rc "ethtool exit code $rc" eend $rc "ethtool exit code $rc"
# TODO: ethtool has MANY different exit codes, with no # TODO: ethtool has MANY different exit codes, with no