|
 |
6e3d83 |
diff -up ebtables-v2.0.9-1/ebtables.sysv.lsb ebtables-v2.0.9-1/ebtables.sysv
|
|
|
6e3d83 |
--- ebtables-v2.0.9-1/ebtables.sysv.lsb 2010-01-15 11:39:31.000000000 +0100
|
|
|
6e3d83 |
+++ ebtables-v2.0.9-1/ebtables.sysv 2010-01-15 12:52:24.000000000 +0100
|
|
|
6e3d83 |
@@ -18,9 +18,9 @@ source /etc/sysconfig/network
|
|
|
6e3d83 |
# Check that networking is up.
|
|
|
6e3d83 |
[ ${NETWORKING} = "no" ] && exit 0
|
|
|
6e3d83 |
|
|
|
6e3d83 |
-[ -x __EXEC_PATH__/ebtables ] || exit 1
|
|
|
6e3d83 |
-[ -x __EXEC_PATH__/ebtables-save ] || exit 1
|
|
|
6e3d83 |
-[ -x __EXEC_PATH__/ebtables-restore ] || exit 1
|
|
|
6e3d83 |
+[ -x __EXEC_PATH__/ebtables ] || exit 5
|
|
|
6e3d83 |
+[ -x __EXEC_PATH__/ebtables-save ] || exit 5
|
|
|
6e3d83 |
+[ -x __EXEC_PATH__/ebtables-restore ] || exit 5
|
|
|
6e3d83 |
|
|
|
6e3d83 |
RETVAL=0
|
|
|
6e3d83 |
prog="ebtables"
|
|
|
6e3d83 |
@@ -39,6 +39,7 @@ config=__SYSCONFIG__/$prog-config
|
|
|
6e3d83 |
[ -f "$config" ] && . "$config"
|
|
|
6e3d83 |
|
|
|
6e3d83 |
start() {
|
|
|
6e3d83 |
+ [ "$EUID" != "0" ] && exit 4
|
|
|
6e3d83 |
echo -n $"Starting $desc ($prog): "
|
|
|
6e3d83 |
if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
|
|
|
6e3d83 |
for table in $(ls __SYSCONFIG__/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do
|
|
|
6e3d83 |
@@ -50,7 +51,7 @@ start() {
|
|
|
6e3d83 |
|
|
|
6e3d83 |
if [ $RETVAL -eq 0 ]; then
|
|
|
6e3d83 |
success "$prog startup"
|
|
|
6e3d83 |
- rm -f /var/lock/subsys/$prog
|
|
|
6e3d83 |
+ touch "/var/lock/subsys/$prog"
|
|
|
6e3d83 |
else
|
|
|
6e3d83 |
failure "$prog startup"
|
|
|
6e3d83 |
fi
|
|
|
6e3d83 |
@@ -58,6 +59,7 @@ start() {
|
|
|
6e3d83 |
}
|
|
|
6e3d83 |
|
|
|
6e3d83 |
stop() {
|
|
|
6e3d83 |
+ [ "$EUID" != "0" ] && exit 4
|
|
|
6e3d83 |
echo -n $"Stopping $desc ($prog): "
|
|
|
6e3d83 |
for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
|
|
|
6e3d83 |
__EXEC_PATH__/ebtables -t $table --init-table || RETVAL=1
|
|
|
6e3d83 |
@@ -71,7 +73,7 @@ stop() {
|
|
|
6e3d83 |
|
|
|
6e3d83 |
if [ $RETVAL -eq 0 ]; then
|
|
|
6e3d83 |
success "$prog shutdown"
|
|
|
6e3d83 |
- rm -f /var/lock/subsys/$prog
|
|
|
6e3d83 |
+ rm -f "/var/lock/subsys/$prog"
|
|
|
6e3d83 |
else
|
|
|
6e3d83 |
failure "$prog shutdown"
|
|
|
6e3d83 |
fi
|
|
|
6e3d83 |
@@ -79,11 +81,13 @@ stop() {
|
|
|
6e3d83 |
}
|
|
|
6e3d83 |
|
|
|
6e3d83 |
restart() {
|
|
|
6e3d83 |
+ [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
|
|
|
6e3d83 |
stop
|
|
|
6e3d83 |
start
|
|
|
6e3d83 |
}
|
|
|
6e3d83 |
|
|
|
6e3d83 |
save() {
|
|
|
6e3d83 |
+ [ "$EUID" != "0" ] && exit 4
|
|
|
6e3d83 |
echo -n $"Saving $desc ($prog): "
|
|
|
6e3d83 |
if [ "$EBTABLES_TEXT_FORMAT" = "yes" ]; then
|
|
|
6e3d83 |
if [ -e __SYSCONFIG__/ebtables ]; then
|
|
|
6e3d83 |
@@ -116,30 +120,34 @@ save() {
|
|
|
6e3d83 |
|
|
|
6e3d83 |
case "$1" in
|
|
|
6e3d83 |
start)
|
|
|
6e3d83 |
+ [ -f "/var/lock/subsys/$prog" ] && exit 0
|
|
|
6e3d83 |
start
|
|
|
6e3d83 |
;;
|
|
|
6e3d83 |
stop)
|
|
|
6e3d83 |
[ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
|
|
|
6e3d83 |
stop
|
|
|
6e3d83 |
;;
|
|
|
6e3d83 |
- restart|reload)
|
|
|
6e3d83 |
- [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
|
|
|
6e3d83 |
+ restart|force-reload)
|
|
|
6e3d83 |
restart
|
|
|
6e3d83 |
;;
|
|
|
6e3d83 |
- condrestart)
|
|
|
6e3d83 |
- [ -e /var/lock/subsys/$prog ] && restart
|
|
|
6e3d83 |
- RETVAL=$?
|
|
|
6e3d83 |
+ reload)
|
|
|
6e3d83 |
+ [ ! -f "/var/lock/subsys/$prog" ] && exit 7
|
|
|
6e3d83 |
+ restart
|
|
|
6e3d83 |
+ ;;
|
|
|
6e3d83 |
+ condrestart|try-restart)
|
|
|
6e3d83 |
+ [ ! -e "/var/lock/subsys/$prog" ] && exit 0
|
|
|
6e3d83 |
+ restart
|
|
|
6e3d83 |
;;
|
|
|
6e3d83 |
save)
|
|
|
6e3d83 |
save
|
|
|
6e3d83 |
;;
|
|
|
6e3d83 |
status)
|
|
|
6e3d83 |
+ [ -f "/var/lock/subsys/$prog" ] && RETVAL=0 || RETVAL=3
|
|
|
6e3d83 |
__EXEC_PATH__/ebtables-save
|
|
|
6e3d83 |
- RETVAL=$?
|
|
|
6e3d83 |
;;
|
|
|
6e3d83 |
*)
|
|
|
6e3d83 |
echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
|
|
|
6e3d83 |
- RETVAL=1
|
|
|
6e3d83 |
+ RETVAL=2
|
|
|
6e3d83 |
esac
|
|
|
6e3d83 |
|
|
|
6e3d83 |
exit $RETVAL
|