luci-0.8: merge r3880

diff --git a/applications/luci-splash/ipkg/postinst b/applications/luci-splash/ipkg/postinst
index 1e4d1793d7b035cc81651d4e1f78872dd0fd09d7..f898ad1620f530a4afe0834dc9b832d9b64d6a28 100755 (executable)
--- a/applications/luci-splash/ipkg/postinst
+++ b/applications/luci-splash/ipkg/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 [ -n "${IPKG_INSTROOT}" ] || {
-       /etc/init.d/luci_splash enable
+       /etc/init.d/luci_splash enabled || /etc/init.d/luci_splash enable
 }

diff --git a/applications/luci-statistics/ipkg/postinst b/applications/luci-statistics/ipkg/postinst
index 536f4bb28a0e69dd763baea902b1929375cab442..8d52ec2d36d5c0e823fbf67ac2cf0a027980ea9c 100755 (executable)
--- a/applications/luci-statistics/ipkg/postinst
+++ b/applications/luci-statistics/ipkg/postinst
@@ -2,6 +2,6 @@
 [ -n "${IPKG_INSTROOT}" ] || {
        ( . /etc/uci-defaults/luci-statistics ) && rm -f /etc/uci-defaults/luci-statistics
 
-       /etc/init.d/luci_statistics enable
-       /etc/init.d/collectd enable
+       /etc/init.d/luci_statistics enabled || /etc/init.d/luci_statistics enable
+       /etc/init.d/collectd enabled || /etc/init.d/collectd enable
 }

diff --git a/contrib/package/olsrd-luci/ipkg/postinst b/contrib/package/olsrd-luci/ipkg/postinst
index 288d7e40d7d8d9c0470ca3fdb0eaaa702f612553..c96480c2e3153ddc7d22357c5ab72404b65d166a 100755 (executable)
--- a/contrib/package/olsrd-luci/ipkg/postinst
+++ b/contrib/package/olsrd-luci/ipkg/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 [ -n "${IPKG_INSTROOT}" ] || {
-       /etc/init.d/olsrd enable
+       /etc/init.d/olsrd enabled || /etc/init.d/olsrd enable
 }

diff --git a/modules/admin-core/ipkg/postinst b/modules/admin-core/ipkg/postinst
index 90138ae76b315960cbbe5846ecd3bd595d4f7f1d..b0293a71bbfb986c590784ca111802ae71a1d2d4 100755 (executable)
--- a/modules/admin-core/ipkg/postinst
+++ b/modules/admin-core/ipkg/postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 [ -n "${IPKG_INSTROOT}" ] || {
-       /etc/init.d/luci_fixtime enable
-       /etc/init.d/luci_ethers enable
-       /etc/init.d/luci_hosts enable
+       /etc/init.d/luci_fixtime enabled || /etc/init.d/luci_fixtime enable
+       /etc/init.d/luci_ethers enabled || /etc/init.d/luci_ethers enable
+       /etc/init.d/luci_hosts enabled || /etc/init.d/luci_hosts enable
 }