summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2008-12-09 00:07:48 +0000
committerJo-Philipp Wich <jow@openwrt.org>2008-12-09 00:07:48 +0000
commitc0a970d7a85bcbf427dee6879fb3d18fcba25535 (patch)
treef36e9186dfa1032211c1cea2609e1773e1b21f89
parente2dbd2a66b8f250e089d0c71b7ee598e0685fb68 (diff)
luci-0.8: merge r3880
-rwxr-xr-xapplications/luci-splash/ipkg/postinst2
-rwxr-xr-xapplications/luci-statistics/ipkg/postinst4
-rwxr-xr-xcontrib/package/olsrd-luci/ipkg/postinst2
-rwxr-xr-xmodules/admin-core/ipkg/postinst6
4 files changed, 7 insertions, 7 deletions
diff --git a/applications/luci-splash/ipkg/postinst b/applications/luci-splash/ipkg/postinst
index 1e4d1793d7..f898ad1620 100755
--- 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 536f4bb28a..8d52ec2d36 100755
--- 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 288d7e40d7..c96480c2e3 100755
--- 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 90138ae76b..b0293a71bb 100755
--- 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
}