Revision 549118f0

b/Makefile.am
1 1
osname=$(subst ganeti-instance-,,$(PACKAGE))
2 2

  
3 3
osdir=$(OS_DIR)/$(osname)
4
customdir=${sysconfdir}/ganeti/instance-image.d
4
customdir=${sysconfdir}/ganeti/instance-image/hooks
5 5
configdir=${sysconfdir}/ganeti/instance-image
6 6
variantsdir=${sysconfdir}/ganeti/instance-image/variants
7 7
networksdir=${sysconfdir}/ganeti/instance-image/networks
b/README
70 70
- ARCH:       Define the architecture of the image to use. Accepts either 'x86'
71 71
              or 'x86_64'.
72 72
- CUSTOMIZE_DIR: A directory containing customization script for the instance.
73
              (by default $sysconfdir/ganeti/instance-image.d) See
73
              (by default $sysconfdir/ganeti/instance-image/hooks) See
74 74
              "Customization of the instance" below.
75 75
- IMAGE_DEBUG: Enable verbose output for instance scripts.
76 76

  
......
217 217
-----------------------------
218 218

  
219 219
If run-parts is in the os create script, and the CUSTOMIZE_DIR (by default
220
$sysconfdir/ganeti/instance-image.d, /etc/ganeti/instance-image.d if you
220
$sysconfdir/ganeti/instance-image/hooks, /etc/ganeti/instance-image/hooks if you
221 221
configured the os with --sysconfdir=/etc) directory exists any executable whose
222 222
name matches the run-parts execution rules (quoting run-parts(8): the names must
223 223
consist entirely of upper and lower case letters, digits, underscores, and
b/common.sh.in
373 373
: ${IMAGE_NAME:=""}
374 374
: ${IMAGE_TYPE:="dump"}
375 375
: ${ARCH:=""}
376
: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-image.d"}
376
: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-image/hooks"}
377 377
: ${VARIANTS_DIR:="@sysconfdir@/ganeti/instance-image/variants"}
378 378
: ${NETWORKS_DIR:="@sysconfdir@/ganeti/instance-image/networks"}
379 379
: ${IMAGE_DIR:="@localstatedir@/cache/ganeti-instance-image"}
b/defaults
41 41

  
42 42
# CUSTOMIZE_DIR: a directory containing scripts to customize the installation.
43 43
# The scripts are executed using run-parts
44
# By default /etc/ganeti/instance-image.d
45
# CUSTOMIZE_DIR="/etc/ganeti/instance-image.d"
44
# By default /etc/ganeti/instance-image/hooks
45
# CUSTOMIZE_DIR="/etc/ganeti/instance-image/hooks"
46 46

  
47 47
# IMAGE_DEBUG: turn on debugging output for the scripts
48 48
# IMAGE_DEBUG=0

Also available in: Unified diff