Compare commits
9 Commits
0.21.2
...
openrc-0.9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14b7f0e7fa | ||
|
|
e45cd15930 | ||
|
|
e4ce98b3b4 | ||
|
|
8a41537f68 | ||
|
|
d8a5d35760 | ||
|
|
cc8a9cdab9 | ||
|
|
04e6696782 | ||
|
|
85193674da | ||
|
|
a73c26a70b |
@@ -1,3 +1,3 @@
|
|||||||
NAME= openrc
|
NAME= openrc
|
||||||
VERSION= 0.9.8.1
|
VERSION= 0.9.8.4
|
||||||
PKG= ${NAME}-${VERSION}
|
PKG= ${NAME}-${VERSION}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ depend()
|
|||||||
need localmount
|
need localmount
|
||||||
after bootmisc
|
after bootmisc
|
||||||
provide net
|
provide net
|
||||||
keyword -shutdown -jail -prefix -vserver
|
keyword -jail -prefix -vserver
|
||||||
|
|
||||||
case "${IFACE}" in
|
case "${IFACE}" in
|
||||||
lo|lo0);;
|
lo|lo0);;
|
||||||
|
|||||||
@@ -74,15 +74,13 @@ mount_misc()
|
|||||||
|
|
||||||
mount_cgroups()
|
mount_cgroups()
|
||||||
{
|
{
|
||||||
yesno ${rc_cgroups:-YES} || return 0
|
yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
|
||||||
if [ ! -e /proc/cgroups ]; then
|
mountinfo -q /sys/fs/cgroup || return 0
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
while read name hier groups enabled rest; do
|
while read name hier groups enabled rest; do
|
||||||
case "${enabled}" in
|
case "${enabled}" in
|
||||||
1) mkdir /sys/fs/cgroup/${name}
|
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}
|
${name} /sys/fs/cgroup/${name}
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user