diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2016-11-21 15:16:07 +0100 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2016-11-21 18:40:15 +0100 |
| commit | afaa34ccd7343e478df8c0cd49019363692bcd16 (patch) | |
| tree | dddb0505208205cd8b39929c1778ba2f151ed452 | |
| parent | a58f176ef2367f000a60a5ce477beb3cbdedf82e (diff) | |
| download | upstream-afaa34ccd7343e478df8c0cd49019363692bcd16.tar.gz upstream-afaa34ccd7343e478df8c0cd49019363692bcd16.tar.bz2 upstream-afaa34ccd7343e478df8c0cd49019363692bcd16.zip | |
base-files: don't modify enabled state of service on upgrade
Properly stop/start services on upgrade, but don't change the enabled
state.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 637d88b5ad..85406a035d 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=170 +PKG_RELEASE:=171 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 232a1c4ed2..a5838f6035 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -175,7 +175,9 @@ default_prerm() { if [ -n "$root" ]; then ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable else - "$i" disable + if [ "$PKG_UPGRADE" != "1" ]; then + "$i" disable + fi "$i" stop fi done @@ -240,17 +242,17 @@ default_postinst() { [ -n "$root" ] || rm -f /tmp/luci-indexcache 2>/dev/null - if [ "$PKG_UPGRADE" != "1" ]; then - local shell="$(which bash)" - for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do - if [ -n "$root" ]; then - ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable - else + local shell="$(which bash)" + for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do + if [ -n "$root" ]; then + ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable + else + if [ "$PKG_UPGRADE" != "1" ]; then "$i" enable - "$i" start fi - done - fi + "$i" start + fi + done return $ret } |