diff -ruN ganeti-instance-debootstrap-0.7.orig/README ganeti-instance-debootstrap-0.7/README
--- ganeti-instance-debootstrap-0.7.orig/README	2009-09-22 21:43:35.000000000 -0700
+++ ganeti-instance-debootstrap-0.7/README	2009-09-22 21:48:10.000000000 -0700
@@ -41,9 +41,9 @@
 The kind of instance created can be customized via a settings file. This
 file is not installed by default, as the instance creation will work
 without it. The creation scripts will look for it in
-``$sysconfdir/default/ganeti-instance-debootstrap``, so if you have run
+``$sysconfdir/ganeti/ganeti-instance-debootstrap``, so if you have run
 configure with the parameter ``--sysconfdir=/etc``, the final filename
-will be ``/etc/default/ganeti-instance-debootstrap``.
+will be ``/etc/ganeti/ganeti-instance-debootstrap``.
 
 The following settings will be examined in this file (see also the file
 named 'defaults' in the source distribution for more details):
@@ -59,7 +59,7 @@
   them work nicely under Xen; the example file containts a few
   suggestions
 - CUSTOMIZE_DIR: a directory containing customization script for the instance.
-  (by default $sysconfdir/ganeti/instance-debootstrap.d) See "Customization of
+  (by default $sysconfdir/ganeti/ganeti-instance-debootstrap.d) See "Customization of
   the instance" below.
 - GENERATE_CACHE: if 'yes' (the default), the installation process will
   save and reuse a cache file to speed reinstalls (located under
@@ -83,13 +83,14 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If run-parts is in the os create script, and the CUSTOMIZE_DIR (by default
-$sysconfdir/ganeti/instance-debootstrap.d, /etc/ganeti/instance-debootstrap.d
-if you configured the os with --sysconfdir=/etc) directory exists any
-executable whose name matches the run-parts execution rules (quoting
-run-parts(8): the  names  must consist entirely of upper and lower case
-letters, digits, underscores, and hyphens) is executed to allow further
-personalization of the installation. The following environment variables are
-passed, in addition to the ones ganeti passes to the OS scripts:
+$sysconfdir/ganeti/ganeti-instance-debootstrap.d,
+/etc/ganeti/ganeti-instance-debootstrap.d if you configured the os with
+--sysconfdir=/etc) directory exists any executable whose name matches the
+run-parts execution rules (quoting run-parts(8): the  names  must consist
+entirely of upper and lower case letters, digits, underscores, and hyphens) is
+executed to allow further personalization of the installation. The following
+environment variables are passed, in addition to the ones ganeti passes to the
+OS scripts:
 
 TARGET: directory in which the filesystem is mounted
 SUITE: suite installed by debootstrap (eg: lenny)
diff -ruN ganeti-instance-debootstrap-0.7.orig/common.sh.in ganeti-instance-debootstrap-0.7/common.sh.in
--- ganeti-instance-debootstrap-0.7.orig/common.sh.in	2009-09-22 21:43:35.000000000 -0700
+++ ganeti-instance-debootstrap-0.7/common.sh.in	2009-09-22 21:46:05.000000000 -0700
@@ -127,7 +127,7 @@
   fi
 }
 
-DEFAULT_FILE="@sysconfdir@/default/ganeti-instance-debootstrap"
+DEFAULT_FILE="@sysconfdir@/ganeti/ganeti-instance-debootstrap"
 if [ -f "$DEFAULT_FILE" ]; then
     . "$DEFAULT_FILE"
 fi
@@ -142,7 +142,7 @@
 : ${SUITE:="lenny"}
 : ${ARCH:=""}
 : ${EXTRA_PKGS:=""}
-: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/instance-debootstrap.d"}
+: ${CUSTOMIZE_DIR:="@sysconfdir@/ganeti/ganeti-instance-debootstrap.d"}
 : ${GENERATE_CACHE:="yes"}
 : ${CLEAN_CACHE:="14"} # number of days to keep a cache file
 if [ -z "$OS_API_VERSION" -o "$OS_API_VERSION" = "5" ]; then