Revision deaae996
| b/Makefile.am | ||
|---|---|---|
| 1 |
osdir=$(OS_DIR)/$(OS_NAME) |
|
| 2 | 1 |
linuxcustomdir=${sysconfdir}/ganeti/instance-image/hooks/linux
|
| 3 | 2 |
|
| 4 | 3 |
if WINSUPPORT |
| ... | ... | |
| 9 | 8 |
variantsdir=${sysconfdir}/ganeti/instance-image/variants
|
| 10 | 9 |
networksdir=${sysconfdir}/ganeti/instance-image/networks
|
| 11 | 10 |
overlaysdir=${sysconfdir}/ganeti/instance-image/overlays
|
| 12 |
toolsdir=$(OS_DIR)/$(OS_NAME)/tools
|
|
| 11 |
toolsdir=$(osdir)/$(osname)/tools
|
|
| 13 | 12 |
|
| 14 | 13 |
dist_os_SCRIPTS = create import export rename verify |
| 15 | 14 |
dist_tools_SCRIPTS = tools/* |
| ... | ... | |
| 28 | 27 |
|
| 29 | 28 |
EXTRA_DIST = common.sh.in defaults |
| 30 | 29 |
|
| 31 |
common.sh: common.sh.in |
|
| 30 |
edit = sed \ |
|
| 31 |
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \ |
|
| 32 |
-e 's|@localstatedir[@]|$(localstatedir)|g' \ |
|
| 33 |
-e 's|@osdir[@]|$(osdir)|g' \ |
|
| 34 |
-e 's|@osname[@]|$(osname)|g' \ |
|
| 35 |
-e 's|@AWK[@]|$(AWK)|g' \ |
|
| 36 |
-e 's|@MKDIR_P[@]|$(MKDIR_P)|g' \ |
|
| 37 |
-e 's|@DUMP[@]|$(DUMP)|g' \ |
|
| 38 |
-e 's|@RESTORE[@]|$(RESTORE)|g' \ |
|
| 39 |
-e 's|@LOSETUP[@]|$(LOSETUP)|g' \ |
|
| 40 |
-e 's|@KPARTX[@]|$(KPARTX)|g' \ |
|
| 41 |
-e 's|@SFDISK[@]|$(SFDISK)|g' \ |
|
| 42 |
-e 's|@QEMU_IMG[@]|$(QEMU_IMG)|g' \ |
|
| 43 |
-e 's|@NTFSCLONE[@]|$(NTFSCLONE)|g' \ |
|
| 44 |
-e 's|@NTFSRESIZE[@]|$(NTFSRESIZE)|g' \ |
|
| 45 |
-e 's|@XMLSTARLET[@]|$(XMLSTARLET)|g' \ |
|
| 46 |
-e 's|@INSTALL_MBR[@]|$(INSTALL_MBR)|g' |
|
| 47 |
|
|
| 48 |
|
|
| 49 |
common.sh: $(srcdir)/common.sh.in Makefile |
|
| 50 |
rm -f $@ $@.tmp |
|
| 51 |
srcdir=''; \ |
|
| 52 |
test -f ./$@.in || srcdir=$(srcdir)/; \ |
|
| 53 |
$(edit) $${srcdir}$@.in >$@.tmp
|
|
| 54 |
mv $@.tmp $@ |
|
| 32 | 55 |
|
| 33 | 56 |
install-exec-local: |
| 34 |
@mkdir_p@ "$(DESTDIR)$(osdir)" |
|
| 57 |
@mkdir_p@ "$(DESTDIR)$(osdir)/$(osname)"
|
|
| 35 | 58 |
@mkdir_p@ "$(DESTDIR)$(variantsdir)" |
| 36 | 59 |
@mkdir_p@ "$(DESTDIR)$(networksdir)/subnets" |
| 37 | 60 |
@mkdir_p@ "$(DESTDIR)$(networksdir)/instances" |
| 38 | 61 |
@mkdir_p@ "$(DESTDIR)$(overlaysdir)" |
| 39 | 62 |
@mkdir_p@ "$(DESTDIR)$(localstatedir)/cache/ganeti-instance-image" |
| 40 | 63 |
touch "$(DESTDIR)$(variantsdir)/default.conf" |
| 41 |
ln -s $(DESTDIR)$(configdir)/variants.list $(DESTDIR)$(osdir)/variants.list |
|
| 64 |
ln -fs $(DESTDIR)$(configdir)/variants.list $(DESTDIR)$(osdir)/variants.list
|
|
| 42 | 65 |
|
| 43 | 66 |
CLEANFILES = common.sh |
| b/common.sh.in | ||
|---|---|---|
| 18 | 18 |
# 02110-1301, USA. |
| 19 | 19 |
|
| 20 | 20 |
AWK="@AWK@" |
| 21 |
MKDIR_P="@MKDIR_P@" |
|
| 21 | 22 |
DUMP="@DUMP@" |
| 22 | 23 |
RESTORE="@RESTORE@" |
| 23 | 24 |
LOSETUP="@LOSETUP@" |
| 24 | 25 |
KPARTX="@KPARTX@" |
| 25 | 26 |
SFDISK="@SFDISK@" |
| 26 | 27 |
QEMU_IMG="@QEMU_IMG@" |
| 27 |
MKDIR_P="@MKDIR_P@" |
|
| 28 | 28 |
NTFSCLONE="@NTFSCLONE@" |
| 29 | 29 |
NTFSRESIZE="@NTFSRESIZE@" |
| 30 | 30 |
XMLSTARLET="@XMLSTARLET@" |
| ... | ... | |
| 230 | 230 |
: ${OVERLAYS_DIR:="@sysconfdir@/ganeti/instance-image/overlays"}
|
| 231 | 231 |
: ${IMAGE_DIR:="@localstatedir@/cache/ganeti-instance-image"}
|
| 232 | 232 |
: ${IMAGE_DEBUG:="no"}
|
| 233 |
: ${TOOLS_DIR:="@OS_DIR@/@OS_NAME@/tools"}
|
|
| 233 |
: ${TOOLS_DIR:="@osdir@/@osname@/tools"}
|
|
| 234 | 234 |
|
| 235 | 235 |
SCRIPT_NAME=$(basename $0) |
| 236 | 236 |
KERNEL_PATH="$INSTANCE_HV_kernel_path" |
| b/configure.ac | ||
|---|---|---|
| 17 | 17 |
AC_ARG_WITH([os-dir], |
| 18 | 18 |
[AS_HELP_STRING([--with-os-dir=DIR], |
| 19 | 19 |
[top-level OS directory under which to install] |
| 20 |
[ (default is $datadir/ganeti/os)]
|
|
| 20 |
[ [DATADIR/ganeti/os]]
|
|
| 21 | 21 |
)], |
| 22 | 22 |
[os_dir="$withval"], |
| 23 | 23 |
[os_dir="$datadir/ganeti/os"]) |
| 24 |
AC_SUBST(OS_DIR, $os_dir)
|
|
| 24 |
AC_SUBST(osdir, $os_dir)
|
|
| 25 | 25 |
|
| 26 | 26 |
# --with-os-name=... |
| 27 | 27 |
AC_ARG_WITH([os-name], |
| 28 | 28 |
[AS_HELP_STRING([--with-os-name=OSNAME], |
| 29 | 29 |
[the name of the OS provider which will be the directory to install its files] |
| 30 |
[ (default is image)]
|
|
| 30 |
[ [image]]
|
|
| 31 | 31 |
)], |
| 32 | 32 |
[os_name="$withval"], |
| 33 | 33 |
[os_name="image"]) |
| 34 |
AC_SUBST(OS_NAME, $os_name)
|
|
| 34 |
AC_SUBST(osname, $os_name)
|
|
| 35 | 35 |
|
| 36 | 36 |
# --with-default-dir=... |
| 37 | 37 |
AC_ARG_WITH([default-dir], |
| 38 | 38 |
[AS_HELP_STRING([--with-default-dir=DIR], |
| 39 | 39 |
[top-level default config directory under which to install] |
| 40 |
[ (default is $sysconfdir/default)]
|
|
| 40 |
[ [SYSCONFDIR/default]]
|
|
| 41 | 41 |
)], |
| 42 | 42 |
[default_dir="$withval"], |
| 43 | 43 |
[default_dir="$sysconfdir/default"]) |
| ... | ... | |
| 110 | 110 |
|
| 111 | 111 |
AC_CONFIG_FILES([ |
| 112 | 112 |
Makefile |
| 113 |
common.sh |
|
| 114 | 113 |
]) |
| 115 | 114 |
|
| 116 | 115 |
AC_OUTPUT |
Also available in: Unified diff