Check in MountImage task if /etc/fstab is present

[snf-image] / snf-image-host / Makefile.am

diff --git a/snf-image-host/Makefile.am b/snf-image-host/Makefile.am
index 8db61d6..ef221af 100644 (file)
--- a/snf-image-host/Makefile.am
+++ b/snf-image-host/Makefile.am
@@ -1,32 +1,26 @@
-if PITHOSIMGSUPPORT
-pithos_backend_support=yes
-else
-pithos_backend_support=no
-endif
-
-if NETWORKIMGSUPPORT
-network_backend_support=yes
-else
-network_backend_support=no
-endif
-
-osname=$(PACKAGE)
+osname=snf-image
 osdir=$(OS_DIR)/$(osname)
 defaultdir=$(DEFAULT_DIR)
+exampledir = $(datarootdir)/doc/$(PACKAGE)
 variantsdir=${sysconfdir}/ganeti/snf-image/variants
+xenscriptsdir=${sysconfdir}/xen/scripts
 
 dist_os_SCRIPTS = ${srcdir}/create ${srcdir}/import ${srcdir}/export \
-                       ${srcdir}/rename ${srcdir}/verify
-if PITHOSIMGSUPPORT
-dist_os_SCRIPTS += ${srcdir}/pithcat
-endif
-       
+       ${srcdir}/rename ${srcdir}/verify ${srcdir}/pithcat \
+       ${srcdir}/copy-monitor.py ${srcdir}/helper-monitor.py \
+       ${srcdir}/host-monitor.py ${srcdir}/decode-config.py
+
 dist_os_DATA = ${srcdir}/ganeti_api_version ${srcdir}/parameters.list \
-               ${srcdir}/variants.list
+               ${srcdir}/variants.list ${srcdir}/xen-common.sh \
+               ${srcdir}/kvm-common.sh
+
+dist_xenscripts_SCRIPTS = ${srcdir}/vif-snf-image
+
+dist_bin_SCRIPTS = snf-image-update-helper snf-image-create-helper
 
-dist_bin_SCRIPTS = snf-image-update-helper
+os_DATA = ${srcdir}/common.sh
 
-os_DATA = common.sh
+example_DATA = defaults multistrap.conf version_pinning.pref
 
 edit = sed \
           -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
@@ -34,11 +28,10 @@ edit = sed \
           -e 's|@osdir[@]|$(osdir)|g' \
           -e 's|@osname[@]|$(osname)|g' \
           -e 's|@defaultdir[@]|$(defaultdir)|g' \
+          -e 's|@VERSION[@]|$(VERSION)|g' \
+          -e 's|@VERSION_CHECK[@]|$(VERSION_CHECK)|g' \
           -e 's|@HELPER_DIR[@]|$(HELPER_DIR)|g' \
-          -e 's|@HELPER_IMG[@]|$(HELPER_IMG)|g' \
-          -e 's|@HELPER_KERNEL[@]|$(HELPER_KERNEL)|g' \
-          -e 's|@HELPER_INITRD[@]|$(HELPER_INITRD)|g' \
-          -e 's|@HELPER_PKG[@]|$(HELPER_PKG)|g' \
+          -e 's|@HELPER_URL[@]|$(HELPER_URL)|g' \
           -e 's|@AWK[@]|$(AWK)|g' \
           -e 's|@MKDIR_P[@]|$(MKDIR_P)|g' \
           -e 's|@LOSETUP[@]|$(LOSETUP)|g' \
@@ -48,9 +41,8 @@ edit = sed \
           -e 's|@INSTALL_MBR[@]|$(INSTALL_MBR)|g' \
           -e 's|@PROGRESS_MONITOR[@]|$(PROGRESS_MONITOR)|g' \
           -e 's|@UNATTEND[@]|$(UNATTEND)|g' \
-          -e 's|@progress_monitor_support[@]|$(progress_monitor_support)|g' \
-          -e 's|@pithos_backend_support[@]|$(pithos_backend_support)|g' \
-          -e 's|@network_backend_support[@]|$(network_backend_support)|g'
+           -e 's|@MULTISTRAP_CONFIG[@]|$(MULTISTRAP_CONFIG)|g' \
+           -e 's|@MULTISTRAP_APTPREFDIR[@]|$(MULTISTRAP_APTPREFDIR)|g'
 
 %:%.in Makefile
        rm -f $@ $@.tmp
@@ -65,4 +57,4 @@ install-exec-local:
        touch "$(DESTDIR)$(variantsdir)/default.conf"
        
 
-CLEANFILES = $(os_DATA) $(dist_bin_SCRIPTS)
+CLEANFILES = $(os_DATA) $(dist_bin_SCRIPTS) defaults