diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-10-06 07:17:12 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-10-06 07:17:12 +0000 |
| commit | 564b9f3505e189da565103bcca4c4e88c63467fd (patch) | |
| tree | c3d1e5b1385934448a1ce2abe8fb78a66bf7213a /sys-cluster | |
| parent | Fix Manifest. (diff) | |
| download | gentoo-2-564b9f3505e189da565103bcca4c4e88c63467fd.tar.gz gentoo-2-564b9f3505e189da565103bcca4c4e88c63467fd.tar.bz2 gentoo-2-564b9f3505e189da565103bcca4c4e88c63467fd.zip | |
Don't hardcode uid/gid wrt bug 339857. Thanks to Joe Flasch <jflasch@eb.com> for the report. Drop old.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/cluster-glue/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild (renamed from sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild) | 17 |
2 files changed, 16 insertions, 10 deletions
diff --git a/sys-cluster/cluster-glue/ChangeLog b/sys-cluster/cluster-glue/ChangeLog index 73f6b4ea08fd..75f23708afbb 100644 --- a/sys-cluster/cluster-glue/ChangeLog +++ b/sys-cluster/cluster-glue/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/cluster-glue # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.8 2010/08/02 05:46:20 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.9 2010/10/06 07:17:12 xarthisius Exp $ + +*cluster-glue-1.0.6-r1 (06 Oct 2010) + + 06 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> + -cluster-glue-1.0.6.ebuild, +cluster-glue-1.0.6-r1.ebuild: + Don't hardcode uid/gid wrt bug 339857. Thanks to Joe Flasch + <jflasch@eb.com> for the report. Drop old. *cluster-glue-1.0.6 (02 Aug 2010) diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild index 182b29b84a8c..75d970e65bbe 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.6.ebuild,v 1.1 2010/08/02 05:46:20 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild,v 1.1 2010/10/06 07:17:12 xarthisius Exp $ EAPI="2" @@ -37,6 +37,11 @@ PATCHES=( "${FILESDIR}/1.0.5-respect_cflags.patch" ) +pkg_setup() { + enewgroup haclient + enewuser hacluster -1 /dev/null /var/lib/heartbeat haclient +} + src_prepare() { base_src_prepare eautoreconf @@ -56,7 +61,8 @@ src_configure() { --with-ocf-root=/usr/$(get_libdir)/ocf \ --sysconfdir=/var \ ${myopts} \ - --with-group-id=65 --with-ccmuser-id=65 \ + --with-group-id=$(id -g hacluster) \ + --with-ccmuser-id=$(id -u hacluster) \ --with-daemon-user=hacluster --with-daemon-group=haclient } @@ -78,13 +84,6 @@ src_install() { rm "${D}"/etc/init.d/logd } -pkg_preinst() { - # check for cluster group, if it doesn't exist make it - groupadd -g 65 haclient - # check for cluster user, if it doesn't exist make it - useradd -u 65 -g haclient -s /dev/null -d /var/lib/heartbeat hacluster -} - pkg_postinst() { chown -R hacluster:haclient /var/lib/heartbeat/cores chown -R hacluster:haclient /var/lib/heartbeat/lrm |