[oe-commits] [meta-openembedded] 05/12: ebtables: Remove bashisms
git at git.openembedded.org
git at git.openembedded.org
Mon Feb 5 16:04:35 UTC 2018
This is an automated email from the git hooks/post-receive script.
joe_macdonald pushed a commit to branch master
in repository meta-openembedded.
commit 1bf1cfab46e3dbef1128515f62d4b2406dbdd12d
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Fri Jan 12 09:02:56 2018 -0600
ebtables: Remove bashisms
Removes the bashism of prefacing shell functions with "function" and
renames the clear function to not conflict with the command of the same
name.
Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
.../ebtables/ebtables-2.0.10-4/ebtables.common | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common
index 640025d..1ae18fe 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common
+++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common
@@ -20,7 +20,7 @@ EBTABLES_BACKUP_SUFFIX="~"
config=/etc/default/$prog
[ -f "$config" ] && . "$config"
-function get_supported_tables() {
+get_supported_tables() {
EBTABLES_SUPPORTED_TABLES=
/sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission
if [ $? -eq 0 ]; then
@@ -35,7 +35,7 @@ function get_supported_tables() {
done
}
-function load() {
+load() {
RETVAL=0
get_supported_tables
echo -n "Restoring ebtables rulesets: "
@@ -64,7 +64,7 @@ function load() {
fi
}
-function clear() {
+clear_rules() {
RETVAL=0
get_supported_tables
echo -n "Clearing ebtables rulesets: "
@@ -90,7 +90,7 @@ function clear() {
fi
}
-function save() {
+save() {
RETVAL=0
get_supported_tables
echo -n "Saving ebtables rulesets: "
@@ -127,11 +127,11 @@ case "$1" in
;;
stop)
[ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
- clear
+ clear_rules
;;
restart|reload|force-reload)
[ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
- clear
+ clear_rules
[ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
;;
load)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list