* luci-0.8: merge r3718

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

diff --git a/applications/luci-statistics/ipkg/postinst b/applications/luci-statistics/ipkg/postinst
index 424d8c88dd345463e71118cdc2d2604914d4e9f6..536f4bb28a0e69dd763baea902b1929375cab442 100755 (executable)
--- a/applications/luci-statistics/ipkg/postinst
+++ b/applications/luci-statistics/ipkg/postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 [ -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 enable
+       /etc/init.d/collectd enable
+}

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

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