Compare commits

...

9 Commits

Author SHA1 Message Date
Robin H. Johnson
14b7f0e7fa I flubbed up the merge on the new fixes, releasing a 0.9.8.4 with the actual fixes. 2012-01-30 20:20:24 +00:00
Robin H. Johnson
e45cd15930 Merge branch 'openrc-0.9.8.x' of git+ssh://git.overlays.gentoo.org/proj/openrc into openrc-0.9.8.x 2012-01-30 20:12:32 +00:00
Robin H. Johnson
e4ce98b3b4 Bugfix release, tracker bug #401555. 2012-01-30 19:54:55 +00:00
William Hubbs
8a41537f68 Revert "Net: do not bring down interfaces during shutdown"
This reverts commit 6d5a2d5f9e.
There are interfaces, such as adsl and ppp interfaces which need to be
brought down. Also, the WOL setting is a good case for bringingdown
interfaces.

Reported-by: Miguel Sanjurjo <Miguel.Sanjurjo @gmail.com>
X-Gentoo-Bug: 401269
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=401269
2012-01-30 12:12:58 -06:00
William Hubbs
d8a5d35760 cgroups: make sure /sys/fs/cgroup is a mount point
We need to make sure this directory is a mount point before we add the
control groups.

Reported-by: Andrej Filipcic <andrej.filipcic@ijs.si>
X-Gentoo-Bug: 400903
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400903
2012-01-30 10:12:08 -06:00
William Hubbs
cc8a9cdab9 Cgroups: do not update mtab when mounting control groups
This is based on a patch submitted by the reporter; however, there was
another mount command which needed -n as well so it was added to the
patch.

Reported-by: Ben Kohler <bkohler@gmail.com>
X-Gentoo-Bug: 400967
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400967
2012-01-30 09:45:49 -06: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
5 changed files with 14 additions and 10 deletions

View File

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

View File

@@ -21,7 +21,7 @@ depend()
need localmount
after bootmisc
provide net
keyword -shutdown -jail -prefix -vserver
keyword -jail -prefix -vserver
case "${IFACE}" in
lo|lo0);;

View File

@@ -74,15 +74,13 @@ mount_misc()
mount_cgroups()
{
yesno ${rc_cgroups:-YES} || return 0
if [ ! -e /proc/cgroups ]; then
return 0
fi
yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
mountinfo -q /sys/fs/cgroup || return 0
while read name hier groups enabled rest; do
case "${enabled}" in
1) mkdir /sys/fs/cgroup/${name}
mount -t cgroup -o nodev,noexec,nosuid,${name} \
mount -n -t cgroup -o nodev,noexec,nosuid,${name} \
${name} /sys/fs/cgroup/${name}
;;
esac

View File

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

View File

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