diff options
| -rw-r--r-- | sys-apps/shadow/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.1.5.ebuild | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index 7c6ff0f22372..c60eaacc6466 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/shadow # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.265 2012/02/13 05:18:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.266 2012/02/16 21:12:56 vapier Exp $ + + 16 Feb 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.ebuild: + Use "-R <root>" option with grp{ck,conv} as it exists in this version. *shadow-4.1.5 (13 Feb 2012) diff --git a/sys-apps/shadow/shadow-4.1.5.ebuild b/sys-apps/shadow/shadow-4.1.5.ebuild index e66c878d7748..947ace6b5354 100644 --- a/sys-apps/shadow/shadow-4.1.5.ebuild +++ b/sys-apps/shadow/shadow-4.1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.ebuild,v 1.1 2012/02/13 05:18:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.ebuild,v 1.2 2012/02/16 21:12:56 vapier Exp $ inherit eutils libtool toolchain-funcs pam multilib @@ -183,13 +183,10 @@ pkg_preinst() { } pkg_postinst() { - # Enable shadow groups (we need ROOT=/ here, as grpconv only - # operate on / ...). - local re="${ROOT}/etc" - if [ ! -f "${re}"/gshadow ] ; then - if grpck -r "${re}"/group "${re}"/gshadow 2>/dev/null ; then - # Would be nice to add --root option to the *conv utils ... - [ "${ROOT}" = "/" ] && grpconv + # Enable shadow groups. + if [ ! -f "${ROOT}"/etc/gshadow ] ; then + if grpck -r -R "${ROOT}" 2>/dev/null ; then + grpconv -R "${ROOT}" else ewarn "Running 'grpck' returned errors. Please run it by hand, and then" ewarn "run 'grpconv' afterwards!" |