aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-01-12 09:02:56 -0600
committerJoe MacDonald <joe_macdonald@mentor.com>2018-02-05 10:40:18 -0500
commit1bf1cfab46e3dbef1128515f62d4b2406dbdd12d (patch)
tree7a640c9928c54183a2be6cfb3de2901a16432f11
parentea97f6b7dba9e3ab25d0f75b0e64d5d1f0a2b951 (diff)
downloadmeta-openembedded-1bf1cfab46e3dbef1128515f62d4b2406dbdd12d.tar.gz
meta-openembedded-1bf1cfab46e3dbef1128515f62d4b2406dbdd12d.tar.bz2
meta-openembedded-1bf1cfab46e3dbef1128515f62d4b2406dbdd12d.zip
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@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common12
1 files 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 640025dba..1ae18fed3 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)