diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2010-12-29 16:09:02 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2010-12-29 16:09:02 +0000 |
| commit | 79a8216dd3a163716fd4ed3aeb2352471e6f0373 (patch) | |
| tree | efe2dd360ac2bf457f22f638f7dc77b409ebcfef /app-backup | |
| parent | x86 stable per bug 349761 (diff) | |
| download | gentoo-2-79a8216dd3a163716fd4ed3aeb2352471e6f0373.tar.gz gentoo-2-79a8216dd3a163716fd4ed3aeb2352471e6f0373.tar.bz2 gentoo-2-79a8216dd3a163716fd4ed3aeb2352471e6f0373.zip | |
Move elog block regarding the AMANDA_SERVER environment variable into pkg_setup. Install the sample cronjob only on non-minimal setups.
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/amanda/ChangeLog | 6 | ||||
| -rw-r--r-- | app-backup/amanda/amanda-3.2.1.ebuild | 35 |
2 files changed, 24 insertions, 17 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog index 0c77352728c4..04ade8675f1a 100644 --- a/app-backup/amanda/ChangeLog +++ b/app-backup/amanda/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-backup/amanda # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.76 2010/12/28 22:11:45 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.77 2010/12/29 16:09:02 idl0r Exp $ + + 29 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild: + Move elog block regarding the AMANDA_SERVER environment variable into + pkg_setup. Install the sample cronjob only on non-minimal setups. 28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild: Fix libcurl dependency again. diff --git a/app-backup/amanda/amanda-3.2.1.ebuild b/app-backup/amanda/amanda-3.2.1.ebuild index 5430830765b7..e3c4cd2563e2 100644 --- a/app-backup/amanda/amanda-3.2.1.ebuild +++ b/app-backup/amanda/amanda-3.2.1.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/app-backup/amanda/amanda-3.2.1.ebuild,v 1.4 2010/12/28 22:11:45 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.5 2010/12/29 16:09:02 idl0r Exp $ EAPI=3 inherit autotools eutils perl-module @@ -114,6 +114,19 @@ amanda_variable_setup() { pkg_setup() { amanda_variable_setup + + # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to + # another host than HOSTNAME. + if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then + elog "You are installing a client-only version of Amanda." + elog "You should set the variable \$AMANDA_SERVER to point at your" + elog "Amanda-tape-server, otherwise you will have to specify its name" + elog "when using amrecover on the client." + elog "For example: Use something like" + elog "AMANDA_SERVER=\"myserver\" emerge amanda" + elog + fi + enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" } @@ -318,9 +331,11 @@ src_install() { newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda fi - einfo "Installing Sample Daily Cron Job for Amanda" - insinto /etc/cron.daily - newins "${MYFILESDIR}/amanda-cron" amanda + if ! use minimal; then + einfo "Installing Sample Daily Cron Job for Amanda" + insinto /etc/cron.daily + newins "${MYFILESDIR}/amanda-cron" amanda + fi insinto /etc/amanda einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" @@ -406,18 +421,6 @@ pkg_postinst() { einfo "If you have migrated safely, please delete /etc/amandates" fi - # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to - # another host than HOSTNAME. - if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then - elog "You are installing a client-only version of Amanda." - elog "You should set the variable \$AMANDA_SERVER to point at your" - elog "Amanda-tape-server, otherwise you will have to specify its name" - elog "when using amrecover on the client." - elog "For example: Use something like" - elog "AMANDA_SERVER=\"myserver\" emerge amanda" - elog - fi - einfo "Checking setuid permissions" amanda_permissions_fix "${ROOT}" |