Author: blogic Date: 2016-04-30 18:53:21 +0200 (Sat, 30 Apr 2016) New Revision: 49275
Modified: trunk/package/base-files/files/lib/functions.sh Log: base-files: split user/group addition code into a function Signed-off-by: John Crispin <[email protected]> Modified: trunk/package/base-files/files/lib/functions.sh =================================================================== --- trunk/package/base-files/files/lib/functions.sh 2016-04-29 11:35:26 UTC (rev 49274) +++ trunk/package/base-files/files/lib/functions.sh 2016-04-30 16:53:21 UTC (rev 49275) @@ -173,11 +173,9 @@ 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,7 +206,15 @@ 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" ) ret=$? _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
