Gentoo Archives: gentoo-commits

From: "Lance Albertson (ramereth)" <ramereth@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/ganeti-instance-debootstrap/files: ganeti-instance-debootstrap-0.7-no-etc-default.patch
Date: Fri, 02 Oct 2009 22:41:30
Message-Id: E1Mtqoa-0000Zp-IF@stork.gentoo.org
1 ramereth 09/10/02 22:41:28
2
3 Added:
4 ganeti-instance-debootstrap-0.7-no-etc-default.patch
5 Log:
6 Initial ebuild for ganeti-instance-debootstrap
7 (Portage version: 2.1.6.13/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-emulation/ganeti-instance-debootstrap/files/ganeti-instance-debootstrap-0.7-no-etc-default.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/ganeti-instance-debootstrap/files/ganeti-instance-debootstrap-0.7-no-etc-default.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/ganeti-instance-debootstrap/files/ganeti-instance-debootstrap-0.7-no-etc-default.patch?rev=1.1&content-type=text/plain
14
15 Index: ganeti-instance-debootstrap-0.7-no-etc-default.patch
16 ===================================================================
17 diff -ruN ganeti-instance-debootstrap-0.7.orig/README ganeti-instance-debootstrap-0.7/README
18 --- ganeti-instance-debootstrap-0.7.orig/README 2009-09-22 21:43:35.000000000 -0700
19 +++ ganeti-instance-debootstrap-0.7/README 2009-09-22 21:48:10.000000000 -0700
20 @@ -41,9 +41,9 @@
21 The kind of instance created can be customized via a settings file. This
22 file is not installed by default, as the instance creation will work
23 without it. The creation scripts will look for it in
24 -``$sysconfdir/default/ganeti-instance-debootstrap``, so if you have run
25 +``$sysconfdir/ganeti/ganeti-instance-debootstrap``, so if you have run
26 configure with the parameter ``--sysconfdir=/etc``, the final filename
27 -will be ``/etc/default/ganeti-instance-debootstrap``.
28 +will be ``/etc/ganeti/ganeti-instance-debootstrap``.
29
30 The following settings will be examined in this file (see also the file
31 named 'defaults' in the source distribution for more details):
32 @@ -59,7 +59,7 @@
33 them work nicely under Xen; the example file containts a few
34 suggestions
35 - CUSTOMIZE_DIR: a directory containing customization script for the instance.
36 - (by default $sysconfdir/ganeti/instance-debootstrap.d) See "Customization of
37 + (by default $sysconfdir/ganeti/ganeti-instance-debootstrap.d) See "Customization of
38 the instance" below.
39 - GENERATE_CACHE: if 'yes' (the default), the installation process will
40 save and reuse a cache file to speed reinstalls (located under
41 @@ -83,13 +83,14 @@
42 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
43
44 If run-parts is in the os create script, and the CUSTOMIZE_DIR (by default
45 -$sysconfdir/ganeti/instance-debootstrap.d, /etc/ganeti/instance-debootstrap.d
46 -if you configured the os with --sysconfdir=/etc) directory exists any
47 -executable whose name matches the run-parts execution rules (quoting
48 -run-parts(8): the names must consist entirely of upper and lower case
49 -letters, digits, underscores, and hyphens) is executed to allow further
50 -personalization of the installation. The following environment variables are
51 -passed, in addition to the ones ganeti passes to the OS scripts:
52 +$sysconfdir/ganeti/ganeti-instance-debootstrap.d,
53 +/etc/ganeti/ganeti-instance-debootstrap.d if you configured the os with
54 +--sysconfdir=/etc) directory exists any executable whose name matches the
55 +run-parts execution rules (quoting run-parts(8): the names must consist
56 +entirely of upper and lower case letters, digits, underscores, and hyphens) is
57 +executed to allow further personalization of the installation. The following
58 +environment variables are passed, in addition to the ones ganeti passes to the
59 +OS scripts:
60
61 TARGET: directory in which the filesystem is mounted
62 SUITE: suite installed by debootstrap (eg: lenny)
63 diff -ruN ganeti-instance-debootstrap-0.7.orig/common.sh.in ganeti-instance-debootstrap-0.7/common.sh.in
64 --- ganeti-instance-debootstrap-0.7.orig/common.sh.in 2009-09-22 21:43:35.000000000 -0700
65 +++ ganeti-instance-debootstrap-0.7/common.sh.in 2009-09-22 21:46:05.000000000 -0700
66 @@ -127,7 +127,7 @@
67 fi
68 }
69
70 -DEFAULT_FILE="@sysconfdir@/default/ganeti-instance-debootstrap"
71 +DEFAULT_FILE="@sysconfdir@/ganeti/ganeti-instance-debootstrap"
72 if [ -f "$DEFAULT_FILE" ]; then
73 . "$DEFAULT_FILE"
74 fi
75 @@ -142,7 +142,7 @@
76 : ${SUITE:="lenny"}
77 : ${ARCH:=""}
78 : ${EXTRA_PKGS:=""}
79 -: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-debootstrap.d"}
80 +: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/ganeti-instance-debootstrap.d"}
81 : ${GENERATE_CACHE:="yes"}
82 : ${CLEAN_CACHE:="14"} # number of days to keep a cache file
83 if [ -z "$OS_API_VERSION" -o "$OS_API_VERSION" = "5" ]; then