netatalk: fix small issues with sample config and config generation

Small issues with sample configureation caused services not to start
or flood log with errors.

Signed-off-by: Antonio Pastor <[email protected]>

diff --git a/net/netatalk/files/atalkd.init b/net/netatalk/files/atalkd.init
index 871fe6e8742cfcb5d151a160303954645cc5bdc4..1c359c36a1499fbef4712e280fe1af640086913a 100755 (executable)
--- a/net/netatalk/files/atalkd.init
+++ b/net/netatalk/files/atalkd.init
@@ -38,12 +38,12 @@ generate_config() {
                }
                config_get _value "$section" "mode"
                [ -z "$_value" ] || append _buffer "-$_value"
+               config_get _value "$section" "phase"
+               [ -z "$_value" ] || append _buffer "-phase $_value"
                config_get _value "$section" "net"
                [ -z "$_value" ] || append _buffer "-net $_value"
                config_get _value "$section" "addr"
                [ -z "$_value" ] || append _buffer "-addr $_value"
-               config_get _value "$section" "phase"
-               [ -z "$_value" ] || append _buffer "-phase $_value"
                atalkd_config="$atalkd_config$_buffer"
                config_list_foreach "$section" zone handle_zone
                atalkd_config="$atalkd_config$NL"

diff --git a/net/netatalk/files/macipgw.conf b/net/netatalk/files/macipgw.conf
index 1c24c0517d0b8966b7a9b94f386b3664303a75c6..48720e7106b1db7d1c9bb09b1c789f4dbcd1c9c0 100644 (file)
--- a/net/netatalk/files/macipgw.conf
+++ b/net/netatalk/files/macipgw.conf
@@ -3,4 +3,4 @@ config macipgw 'macipgw'
        #option zone 'Gateway'
        option nameserver '192.168.1.1'
        option network '192.168.100.0'
-       option netmask '255.255.225.0'
+       option netmask '255.255.255.0'

diff --git a/net/netatalk/files/papd.conf b/net/netatalk/files/papd.conf
index 02f955d693ba1a947161d9849cc052a0fbed2d4f..fd8f058504c2f4439170628dd154c6edd837d4bd 100644 (file)
--- a/net/netatalk/files/papd.conf
+++ b/net/netatalk/files/papd.conf
@@ -1,6 +1,6 @@
 config papd 'papd'
-       # set enable to 0 to skip service startup
-       option papd_enable '0'
+       # set disabled to 1 to skip service startup
+       option disabled '1'
        # set config_overwrite to 0 if manually editing config file and to have init ignore this file
        option config_overwrite '1'
        # set to /etc/papd.con to use config file provided with package (useful if manually editing it)