diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2008-12-09 00:03:08 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2008-12-09 00:03:08 +0000 |
| commit | f7a3e34955fdcf9678fd0a5e18c8b06b6fc6b244 (patch) | |
| tree | bfd1eb5781003110187545a1ea57d849fe0eb987 | |
| parent | 08fc73b8a6bb87c4094188fb60ebaed88c82d4c7 (diff) | |
prevent package upgrade failures caused by sloppy postinstalls
| -rwxr-xr-x | applications/luci-splash/ipkg/postinst | 4 | ||||
| -rwxr-xr-x | applications/luci-statistics/ipkg/postinst | 6 | ||||
| -rwxr-xr-x | contrib/package/olsrd-luci/ipkg/postinst | 4 | ||||
| -rwxr-xr-x | libs/lucittpd/ipkg/postinst | 4 | ||||
| -rwxr-xr-x | modules/admin-core/ipkg/postinst | 8 |
5 files changed, 9 insertions, 17 deletions
diff --git a/applications/luci-splash/ipkg/postinst b/applications/luci-splash/ipkg/postinst index 0a4ca74cb..f898ad162 100755 --- 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 e69ae4726..8d52ec2d3 100755 --- 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 cd38fcfaf..c96480c2e 100755 --- 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 3c25ea664..d3890aa0e 100755 --- 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 a849819c6..b0293a71b 100755 --- 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 } |