prevent package upgrade failures caused by sloppy postinstalls

diff --git a/applications/luci-splash/ipkg/postinst b/applications/luci-splash/ipkg/postinst
index 0a4ca74cb7ab727eb235365c8ddff016a0576062..f898ad1620f530a4afe0834dc9b832d9b64d6a28 100755 (executable)
--- a/applications/luci-splash/ipkg/postinst
+++ b/applications/luci-splash/ipkg/postinst
@@ -1,7 +1,5 @@
 #!/bin/sh
 
 [ -n "${IPKG_INSTROOT}" ] || {
-       /etc/init.d/luci_splash enable
-
-       exit 0
+       /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 e69ae47266f3a78b80badc44353e2786b1a71506..8d52ec2d36d5c0e823fbf67ac2cf0a027980ea9c 100755 (executable)
--- a/applications/luci-statistics/ipkg/postinst
+++ b/applications/luci-statistics/ipkg/postinst
@@ -2,8 +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
-
-       exit 0
+       /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 cd38fcfaf01f2038247386a172a2ca2dd6fd41a7..c96480c2e3153ddc7d22357c5ab72404b65d166a 100755 (executable)
--- a/contrib/package/olsrd-luci/ipkg/postinst
+++ b/contrib/package/olsrd-luci/ipkg/postinst
@@ -1,7 +1,5 @@
 #!/bin/sh
 
 [ -n "${IPKG_INSTROOT}" ] || {
-       /etc/init.d/olsrd enable
-
-       exit 0
+       /etc/init.d/olsrd enabled || /etc/init.d/olsrd enable
 }

diff --git a/libs/lucittpd/ipkg/postinst b/libs/lucittpd/ipkg/postinst
index 3c25ea664f7044ac82e8f0d7405c15d39112654a..d3890aa0e9d8cceacfa117a1f32e4ee4aca2545a 100755 (executable)
--- a/libs/lucittpd/ipkg/postinst
+++ b/libs/lucittpd/ipkg/postinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 [ -n "${IPKG_INSTROOT}" ] || {
-        /etc/init.d/lucittpd enable
-       /etc/init.d/lucittpd start
+        /etc/init.d/lucittpd enabled || /etc/init.d/lucittpd enable
+       /etc/init.d/lucittpd start || true
 }
 

diff --git a/modules/admin-core/ipkg/postinst b/modules/admin-core/ipkg/postinst
index a849819c6c4aa956c3510ec42d37e4bfe9422389..b0293a71bbfb986c590784ca111802ae71a1d2d4 100755 (executable)
--- a/modules/admin-core/ipkg/postinst
+++ b/modules/admin-core/ipkg/postinst
@@ -1,9 +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
-
-       exit 0
+       /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
 }