pool/ebtables
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 715400 from security:netfilter

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/715400
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ebtables?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger
2019-07-17 12:22:38 +00:00
committed by Git OBS Bridge
parent a661df4a73 2e703e0f84
commit 05405367ca
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ebtables.changes
View File

@@ -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> Fri Feb 22 14:04:30 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>

16
ebtables.systemd
View File

@@ -6,7 +6,7 @@ initialize() {
# Initialize $TYPE tables # Initialize $TYPE tables
echo -n $" $TYPE tables: " echo -n $" $TYPE tables: "
if [ -r /etc/sysconfig/ebtables.$TYPE ]; then 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 else
echo -n "not configured" echo -n "not configured"
fi fi
@@ -36,12 +36,12 @@ case $1 in
initialize initialize
;; ;;
stop) stop)
/sbin/ebtables -t filter --init-table || RETVAL=1 /usr/sbin/ebtables -t filter --init-table || RETVAL=1
/sbin/ebtables -t nat --init-table || RETVAL=1 /usr/sbin/ebtables -t nat --init-table || RETVAL=1
/sbin/ebtables -t broute --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 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 done
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
@@ -54,9 +54,9 @@ case $1 in
;; ;;
save) save)
echo -n $"Saving Ethernet bridge filtering (ebtables): " echo -n $"Saving Ethernet bridge filtering (ebtables): "
/sbin/ebtables -t filter --atomic-file /etc/sysconfig/ebtables.filter --atomic-save || RETVAL=1 /usr/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 /usr/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 broute --atomic-file /etc/sysconfig/ebtables.broute --atomic-save || RETVAL=1
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
echo -n $"[ OK ]" echo -n $"[ OK ]"
echo -ne "\r" echo -ne "\r"