| 1 |
idl0r 10/12/29 16:09:02 |
| 2 |
|
| 3 |
Modified: ChangeLog amanda-3.2.1.ebuild |
| 4 |
Log: |
| 5 |
Move elog block regarding the AMANDA_SERVER environment variable into pkg_setup. Install the sample cronjob only on non-minimal setups. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.77 app-backup/amanda/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.77&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.77&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.76&r2=1.77 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v |
| 19 |
retrieving revision 1.76 |
| 20 |
retrieving revision 1.77 |
| 21 |
diff -u -r1.76 -r1.77 |
| 22 |
--- ChangeLog 28 Dec 2010 22:11:45 -0000 1.76 |
| 23 |
+++ ChangeLog 29 Dec 2010 16:09:02 -0000 1.77 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-backup/amanda |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.76 2010/12/28 22:11:45 idl0r Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.77 2010/12/29 16:09:02 idl0r Exp $ |
| 29 |
+ |
| 30 |
+ 29 Dec 2010; Christian Ruppert <idl0r@g.o> amanda-3.2.1.ebuild: |
| 31 |
+ Move elog block regarding the AMANDA_SERVER environment variable into |
| 32 |
+ pkg_setup. Install the sample cronjob only on non-minimal setups. |
| 33 |
|
| 34 |
28 Dec 2010; Christian Ruppert <idl0r@g.o> amanda-3.2.1.ebuild: |
| 35 |
Fix libcurl dependency again. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 app-backup/amanda/amanda-3.2.1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: amanda-3.2.1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- amanda-3.2.1.ebuild 28 Dec 2010 22:11:45 -0000 1.4 |
| 52 |
+++ amanda-3.2.1.ebuild 29 Dec 2010 16:09:02 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.4 2010/12/28 22:11:45 idl0r Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.5 2010/12/29 16:09:02 idl0r Exp $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
inherit autotools eutils perl-module |
| 61 |
@@ -114,6 +114,19 @@ |
| 62 |
|
| 63 |
pkg_setup() { |
| 64 |
amanda_variable_setup |
| 65 |
+ |
| 66 |
+ # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to |
| 67 |
+ # another host than HOSTNAME. |
| 68 |
+ if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then |
| 69 |
+ elog "You are installing a client-only version of Amanda." |
| 70 |
+ elog "You should set the variable \$AMANDA_SERVER to point at your" |
| 71 |
+ elog "Amanda-tape-server, otherwise you will have to specify its name" |
| 72 |
+ elog "when using amrecover on the client." |
| 73 |
+ elog "For example: Use something like" |
| 74 |
+ elog "AMANDA_SERVER=\"myserver\" emerge amanda" |
| 75 |
+ elog |
| 76 |
+ fi |
| 77 |
+ |
| 78 |
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}" |
| 79 |
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}" |
| 80 |
} |
| 81 |
@@ -318,9 +331,11 @@ |
| 82 |
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda |
| 83 |
fi |
| 84 |
|
| 85 |
- einfo "Installing Sample Daily Cron Job for Amanda" |
| 86 |
- insinto /etc/cron.daily |
| 87 |
- newins "${MYFILESDIR}/amanda-cron" amanda |
| 88 |
+ if ! use minimal; then |
| 89 |
+ einfo "Installing Sample Daily Cron Job for Amanda" |
| 90 |
+ insinto /etc/cron.daily |
| 91 |
+ newins "${MYFILESDIR}/amanda-cron" amanda |
| 92 |
+ fi |
| 93 |
|
| 94 |
insinto /etc/amanda |
| 95 |
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" |
| 96 |
@@ -406,18 +421,6 @@ |
| 97 |
einfo "If you have migrated safely, please delete /etc/amandates" |
| 98 |
fi |
| 99 |
|
| 100 |
- # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to |
| 101 |
- # another host than HOSTNAME. |
| 102 |
- if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then |
| 103 |
- elog "You are installing a client-only version of Amanda." |
| 104 |
- elog "You should set the variable \$AMANDA_SERVER to point at your" |
| 105 |
- elog "Amanda-tape-server, otherwise you will have to specify its name" |
| 106 |
- elog "when using amrecover on the client." |
| 107 |
- elog "For example: Use something like" |
| 108 |
- elog "AMANDA_SERVER=\"myserver\" emerge amanda" |
| 109 |
- elog |
| 110 |
- fi |
| 111 |
- |
| 112 |
einfo "Checking setuid permissions" |
| 113 |
amanda_permissions_fix "${ROOT}" |
Archives