aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-05-19 09:13:17 +0000
committerJonas Gorski <jogo@openwrt.org>2015-05-19 09:13:17 +0000
commitd0af85c9a5ea546aa8f7322d52c8d256c2895902 (patch)
treeb13e62731e0f55e8cdf36256cfa6968f212654b6 /package/base-files
parent241dbffcf9d4de1f95926c751e8f3259f988b000 (diff)
downloadupstream-d0af85c9a5ea546aa8f7322d52c8d256c2895902.tar.gz
upstream-d0af85c9a5ea546aa8f7322d52c8d256c2895902.tar.bz2
upstream-d0af85c9a5ea546aa8f7322d52c8d256c2895902.zip
base-files: fix default pre-/postrm for packages with a dot
Instead of stripping everything after the first dot, strip everything after the last dot. This fixes pre-/postrm actions for packages with a dot in their name, like libusb-1.0. Fixes #19668. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45702
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/lib/functions.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index 72d954db3c..8d045fa642 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -165,7 +165,7 @@ insert_modules() {
default_prerm() {
local name
- name=$(echo $(basename $1) | cut -d. -f1)
+ 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
@@ -175,7 +175,7 @@ default_prerm() {
default_postinst() {
local pkgname rusers
- pkgname=$(echo $(basename $1) | cut -d. -f1)
+ pkgname=$(basename ${1%.*})
rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.control)
[ -n "$rusers" ] && {
local user group uid gid