From 2e703e0f84bc10120b7d227e4c7e117b650bb11b6832693fa9d166fe7798cc21 Mon Sep 17 00:00:00 2001
From: Kristyna Streitova <kstreitova@suse.com>
Date: Mon, 15 Jul 2019 07:52:56 +0000
Subject: [PATCH] Accepting request 714421 from
 home:kstreitova:branches:security:netfilter

- fix path (/sbin -> /usr/sbin) in ebtables.systemd [bsc#1140898]

OBS-URL: https://build.opensuse.org/request/show/714421
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=59
---
 ebtables.changes |  5 +++++
 ebtables.systemd | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ebtables.changes b/ebtables.changes
index dae64a5..bc5cf9d 100644
--- a/ebtables.changes
+++ b/ebtables.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 10 11:30:50 UTC 2019 - Kristyna Streitova <kstreitova@suse.com>
+
+- fix path (/sbin -> /usr/sbin) in ebtables.systemd [bsc#1140898]
+
 -------------------------------------------------------------------
 Fri Feb 22 14:04:30 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
 
diff --git a/ebtables.systemd b/ebtables.systemd
index 80d6970..8de6aca 100644
--- a/ebtables.systemd
+++ b/ebtables.systemd
@@ -6,7 +6,7 @@ initialize() {
   # Initialize $TYPE tables
   echo -n $"  $TYPE tables: "
   if [ -r /etc/sysconfig/ebtables.$TYPE ]; then
-    /sbin/ebtables -t $TYPE --atomic-file /etc/sysconfig/ebtables.$TYPE --atomic-commit > /dev/null || RETVAL=1
+    /usr/sbin/ebtables -t $TYPE --atomic-file /etc/sysconfig/ebtables.$TYPE --atomic-commit > /dev/null || RETVAL=1
   else
     echo -n "not configured"
   fi
@@ -36,12 +36,12 @@ case $1 in
    initialize
   ;;
   stop)
-    /sbin/ebtables -t filter --init-table || RETVAL=1
-    /sbin/ebtables -t nat --init-table || RETVAL=1
-    /sbin/ebtables -t broute --init-table || RETVAL=1
+    /usr/sbin/ebtables -t filter --init-table || RETVAL=1
+    /usr/sbin/ebtables -t nat --init-table || RETVAL=1
+    /usr/sbin/ebtables -t broute --init-table || RETVAL=1
 
     for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do
-       /sbin/rmmod $mod || RETVAL=1
+       /usr/sbin/rmmod $mod || RETVAL=1
     done
 
     if [ $RETVAL -eq 0 ]; then
@@ -54,9 +54,9 @@ case $1 in
   ;;
   save)
     echo -n $"Saving Ethernet bridge filtering (ebtables): "
-    /sbin/ebtables -t filter --atomic-file /etc/sysconfig/ebtables.filter --atomic-save || RETVAL=1
-    /sbin/ebtables -t nat --atomic-file /etc/sysconfig/ebtables.nat --atomic-save || RETVAL=1
-    /sbin/ebtables -t broute --atomic-file /etc/sysconfig/ebtables.broute --atomic-save || RETVAL=1
+    /usr/sbin/ebtables -t filter --atomic-file /etc/sysconfig/ebtables.filter --atomic-save || RETVAL=1
+    /usr/sbin/ebtables -t nat --atomic-file /etc/sysconfig/ebtables.nat --atomic-save || RETVAL=1
+    /usr/sbin/ebtables -t broute --atomic-file /etc/sysconfig/ebtables.broute --atomic-save || RETVAL=1
     if [ $RETVAL -eq 0 ]; then
       echo -n $"[  OK  ]"
       echo -ne "\r"