coova-chilli: Fix debug flag config example and synchronize bool options

debug is boolean option/flag so setting it to 9 doesn't work, while at
it I've synchronized boolean options from source code and sorted it
alphabeticaly with following command:

  grep flag src/cmdline.ggo | cut -d \" -f2 | sort | tr '\n' '|'

Signed-off-by: Petr Štetiar <redacted>

diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile
index 7d6259dd5e42a0f04879727f19aef30d89b84ce5..510c4a197eb575af7008200a26835be13d55e77e 100644 (file)
--- a/net/coova-chilli/Makefile
+++ b/net/coova-chilli/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coova-chilli
 PKG_VERSION:=1.4
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/coova/coova-chilli/tar.gz/$(PKG_VERSION)?

diff --git a/net/coova-chilli/files/chilli.config b/net/coova-chilli/files/chilli.config
index 41ee6cd26886959ddcaf37e8c667c1d3895c30ed..997560368eab4cb03fe02badc210d4fa14aca27d 100644 (file)
--- a/net/coova-chilli/files/chilli.config
+++ b/net/coova-chilli/files/chilli.config
@@ -16,7 +16,7 @@ config chilli
     #option fg
 
     # Include this flag to include debug information.
-    #option debug 9
+    #option debug 1
 
     # Re-read configuration file at this interval. Will also cause new domain
     # name lookups to be performed. Value is given in seconds.

diff --git a/net/coova-chilli/files/chilli.init b/net/coova-chilli/files/chilli.init
index bf34cfc82bfd92a93a772946a382d1de1d760f16..b1015f38859cf81e026ca3324d9fd04e0e38742c 100644 (file)
--- a/net/coova-chilli/files/chilli.init
+++ b/net/coova-chilli/files/chilli.init
@@ -26,15 +26,17 @@ option_cb() {
                        echo "dhcpif=\"$ifname\"" >> "$chilli_conf"
                        ;;
                # boolean settings
-               debug|dhcpbroadcast|nodynip|vlanlocation|locationstopstart|locationcopycalled|\
-               locationimmediateupdate|locationopt82|coanoipcheck|noradallow|proxymacaccept|\
-               proxyonacct|dhcpmacset|dhcpradius|noc2c|eapolenable|uamanydns|uamanyip|uamnatanyip|\
-               nouamsuccess|nowispr1|nowispr2|domaindnslocal|radsec|macauth|macreauth|macauthdeny|\
-               macallowlocal|strictmacauth|strictdhcp|ieee8021q|only8021q|radiusoriginalurl|swapoctets|\
-               statusfilesave|wpaguests|openidauth|papalwaysok|mschapv2|chillixml|acctupdate|dnsparanoia|\
-               seskeepalive|usetap|noarpentries|framedservice|scalewin|redir|injectwispr|redirurl|\
-               routeonetone|nousergardendata|uamgardendata|uamotherdata|withunixipc|uamallowpost|redirssl|\
-               uamuissl|layer3|patricia|redirdnsreq|dhcpnotidle|ipv6|ipv6only)
+               acctupdate|chillixml|coanoipcheck|debug|dhcpbroadcast|dhcpmacset|dhcpnotidle|\
+               dhcpradius|dnsparanoia|domaindnslocal|eapolenable|fg|forgiving|framedservice|\
+               ieee8021q|injectwispr|ipv6|ipv6only|layer3|locationcopycalled|\
+               locationimmediateupdate|locationopt82|locationstopstart|macallowlocal|\
+               macauth|macauthdeny|macreauth|mmapring|mschapv2|noarpentries|noc2c|nochallenge|\
+               nodynip|noradallow|nosystemdns|nouamsuccess|nousergardendata|nowispr1|nowispr2|\
+               only8021q|openidauth|papalwaysok|patricia|postauthproxyssl|proxymacaccept|\
+               proxyonacct|radiusoriginalurl|radsec|redir|redirdnsreq|redirssl|redirurl|reload|\
+               routeonetone|scalewin|seskeepalive|statusfilesave|strictdhcp|strictmacauth|\
+               swapoctets|uamallowpost|uamanydns|uamanyip|uamauthedallowed|uamgardendata|\
+               uamnatanyip|uamotherdata|uamuissl|usetap|vlanlocation|wpaguests)
                        [ "$2" = "true" -o "$2" = "1" ] && echo "$1" >> "$chilli_conf"
                        ;;
                *)