ebtables/patches/ebtables-2.0.9-lsb.patch

   1 diff -up ebtables-v2.0.9-1/ebtables.sysv.lsb ebtables-v2.0.9-1/ebtables.sysv
   2 --- ebtables-v2.0.9-1/ebtables.sysv.lsb 2010-01-15 11:39:31.000000000 +0100
   3 +++ ebtables-v2.0.9-1/ebtables.sysv     2010-01-15 12:52:24.000000000 +0100
   4 @@ -18,9 +18,9 @@ source /etc/sysconfig/network
   5  # Check that networking is up.
   6  [ ${NETWORKING} = "no" ] && exit 0
   7
   8 -[ -x __EXEC_PATH__/ebtables ] || exit 1
   9 -[ -x __EXEC_PATH__/ebtables-save ] || exit 1
  10 -[ -x __EXEC_PATH__/ebtables-restore ] || exit 1
  11 +[ -x __EXEC_PATH__/ebtables ] || exit 5
  12 +[ -x __EXEC_PATH__/ebtables-save ] || exit 5
  13 +[ -x __EXEC_PATH__/ebtables-restore ] || exit 5
  14
  15  RETVAL=0
  16  prog="ebtables"
  17 @@ -39,6 +39,7 @@ config=__SYSCONFIG__/$prog-config
  18  [ -f "$config" ] && . "$config"
  19
  20  start() {
  21 +       [ "$EUID" != "0" ] && exit 4
  22         echo -n $"Starting $desc ($prog): "
  23         if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
  24                 for table in $(ls __SYSCONFIG__/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do
  25 @@ -50,7 +51,7 @@ start() {
  26
  27         if [ $RETVAL -eq 0 ]; then
  28                 success "$prog startup"
  29 -               rm -f /var/lock/subsys/$prog
  30 +               touch "/var/lock/subsys/$prog"
  31         else
  32                 failure "$prog startup"
  33         fi
  34 @@ -58,6 +59,7 @@ start() {
  35  }
  36
  37  stop() {
  38 +       [ "$EUID" != "0" ] && exit 4
  39         echo -n $"Stopping $desc ($prog): "
  40         for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
  41                 __EXEC_PATH__/ebtables -t $table --init-table || RETVAL=1
  42 @@ -71,7 +73,7 @@ stop() {
  43
  44         if [ $RETVAL -eq 0 ]; then
  45                 success "$prog shutdown"
  46 -               rm -f /var/lock/subsys/$prog
  47 +               rm -f "/var/lock/subsys/$prog"
  48         else
  49                 failure "$prog shutdown"
  50         fi
  51 @@ -79,11 +81,13 @@ stop() {
  52  }
  53
  54  restart() {
  55 +       [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
  56         stop
  57         start
  58  }
  59
  60  save() {
  61 +       [ "$EUID" != "0" ] && exit 4
  62         echo -n $"Saving $desc ($prog): "
  63         if [ "$EBTABLES_TEXT_FORMAT" = "yes" ]; then
  64                 if [ -e __SYSCONFIG__/ebtables ]; then
  65 @@ -116,30 +120,34 @@ save() {
  66
  67  case "$1" in
  68    start)
  69 +       [ -f "/var/lock/subsys/$prog" ] && exit 0
  70         start
  71         ;;
  72    stop)
  73         [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
  74         stop
  75         ;;
  76 -  restart|reload)
  77 -       [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
  78 +  restart|force-reload)
  79         restart
  80         ;;
  81 -  condrestart)
  82 -       [ -e /var/lock/subsys/$prog ] && restart
  83 -       RETVAL=$?
  84 +  reload)
  85 +       [ ! -f "/var/lock/subsys/$prog" ] && exit 7
  86 +       restart
  87 +       ;;
  88 +  condrestart|try-restart)
  89 +       [ ! -e "/var/lock/subsys/$prog" ] && exit 0
  90 +       restart
  91         ;;
  92    save)
  93         save
  94         ;;
  95    status)
  96 +       [ -f "/var/lock/subsys/$prog" ] && RETVAL=0 || RETVAL=3
  97         __EXEC_PATH__/ebtables-save
  98 -       RETVAL=$?
  99         ;;
 100    *)
 101         echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
 102 -       RETVAL=1
 103 +       RETVAL=2
 104  esac
 105
 106  exit $RETVAL