From: Matthias Schiffer Date: Mon, 26 Sep 2016 13:25:37 +0000 (+0200) Subject: base-files: make default_prerm work offline X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=26b4216f95d2c262144d7e3744b0a541cf210506;p=openwrt%2Fstaging%2Fsvanheule.git base-files: make default_prerm work offline IPKG_INSTROOT must be respected for offline removal (used for per-device rootfs). Signed-off-by: Matthias Schiffer --- diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index e6c6822cec..232a1c4ed2 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -164,12 +164,20 @@ insert_modules() { } default_prerm() { + local root="${IPKG_INSTROOT}" local name + name=$(basename ${1%.*}) - [ -f /usr/lib/opkg/info/${name}.prerm-pkg ] && . /usr/lib/opkg/info/${name}.prerm-pkg - for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do - $i disable - $i stop + [ -f "$root/usr/lib/opkg/info/${name}.prerm-pkg" ] && . "$root/usr/lib/opkg/info/${name}.prerm-pkg" + + local shell="$(which bash)" + for i in `cat "$root/usr/lib/opkg/info/${name}.list" | grep "^/etc/init.d/"`; do + if [ -n "$root" ]; then + ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable + else + "$i" disable + "$i" stop + fi done }