Merge pull request #472 from yogo1212/batmand_whitespace

batmand: whitespace
This commit is contained in:
elektra42 2019-05-27 09:04:38 +02:00 committed by GitHub
commit bf475d6493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 18 deletions

View File

@ -79,7 +79,7 @@ MAKE_BATGAT_ARGS += \
PATH="$(TARGET_PATH)" \
SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
LINUX_VERSION="$(LINUX_VERSION)" \
REVISION="$(PKG_REV)" modules
REVISION="$(PKG_REV)" modules
define Build/Configure
@ -88,11 +88,11 @@ endef
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_BATMAND_ARGS)
endif
ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
endif
define Build/Compile
$(BUILD_BATMAND)
cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile

View File

@ -1,12 +1,11 @@
config batmand general
option interface ath0
option hna
option gateway_class
option hna
option gateway_class
option originator_interval
option preferred_gateway
option preferred_gateway
option routing_class
option visualisation_srv
option policy_routing_script
option disable_client_nat
option disable_aggregation

View File

@ -18,10 +18,9 @@ start () {
disable_aggregation=$(uci get batmand.general.disable_aggregation)
batman_args=""
for hna in $hnas
do
batman_args=${batman_args}'-a '$hna' '
done
for hna in $hnas; do
batman_args=${batman_args}'-a '$hna' '
done
if [ $gateway_class ]; then
batman_args=${batman_args}'-g '$gateway_class' '
@ -38,19 +37,19 @@ start () {
if [ $routing_class ]; then
batman_args=${batman_args}'-r '$routing_class' '
fi
if [ $visualisation_srv ]; then
batman_args=${batman_args}'-s '$visualisation_srv' '
fi
if [ $policy_routing_script ]; then
batman_args=${batman_args}'--policy-routing-script '$policy_routing_script' '
fi
if [ $disable_client_nat ]; then
batman_args=${batman_args}'--disable-client-nat '
fi
if [ $disable_aggregation ]; then
batman_args=${batman_args}'--disable-aggregation '
fi
@ -60,7 +59,5 @@ start () {
}
stop () {
killall batmand
killall batmand
}