Browse Source

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 <[email protected]>
Matthias Schiffer 9 years ago
parent
commit
26b4216f95
1 changed files with 12 additions and 4 deletions
  1. 12 4
      package/base-files/files/lib/functions.sh

+ 12 - 4
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
 }