From 1e03d69c8cadc2fb1d07c91ef2de48a0318af785 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 30 Apr 2016 16:53:21 +0000 Subject: [PATCH] base-files: split user/group addition code into a function Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49275 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/lib/functions.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 8582605991..4ec0cac332 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -173,11 +173,9 @@ default_prerm() { done } -default_postinst() { - local root="${IPKG_INSTROOT}" - local pkgname="$(basename ${1%.*})" +add_group_and_user() { + local pkgname="$1" local rusers="$(sed -ne 's/^Require-User: *//p' $root/usr/lib/opkg/info/${pkgname}.control 2>/dev/null)" - local ret=0 if [ -n "$rusers" ]; then local tuple oIFS="$IFS" @@ -208,6 +206,14 @@ default_postinst() { unset uid gid uname gname done fi +} + +default_postinst() { + local root="${IPKG_INSTROOT}" + local pkgname="$(basename ${1%.*})" + local ret=0 + + add_group_and_user "${pkgname}" if [ -f "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" ]; then ( . "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" ) -- 2.11.0