Fix typos, remove reference to $windows_support

[snf-image] / snf-image-host / defaults

diff --git a/snf-image-host/defaults b/snf-image-host/defaults
index fc4631a..027c2ba 100644 (file)
--- a/snf-image-host/defaults
+++ b/snf-image-host/defaults
@@ -7,8 +7,7 @@
 # IMAGE_NAME=""
 
 # IMAGE_DIR: directory location for disk images
-# ( default is @localstatedir@/cache/ganeti-instance-image )
-# IMAGE_DIR=""
+# IMAGE_DIR="/var/lib/snf-image"
 
 # ARCH: Define the ARCH of the image to use
 # Use either x86 or x86_64
@@ -18,7 +17,7 @@
 # IMAGE_DEBUG=0
 
 # HELPER_DIR: Directory hosting the helper files
-# HELPER_DIR: /var/lib/snf-image/helper/
+# HELPER_DIR="/var/lib/snf-image/helper/"
 
 # HELPER_IMG: Path to the helper VM image
 # HELPER_IMG="$(HELPER_DIR)/image"
@@ -26,31 +25,38 @@
 # HELPER_KERNEL: Path to the helper VM kernel
 # HELPER_KERNEL="$(HELPER_DIR)/kernel"
 
-# HELPER_PKG: Path to the snf-image-helper package
-# HELPER_PKG="$(HELPER_DIR)/snf-image-helper.deb"
-
 # HELPER_INITRD: Path to the helper VM initial ramdisk
 # HELPER_INITRD="$(HELPER_DIR)/initrd"
 
+# HELPER_PKG: Path to the snf-image-helper package
+# HELPER_PKG="$(HELPER_DIR)/snf-image-helper.deb"
+
 # HELPER_TIMOUT: Soft and hard timeout limits for helper instance.
 # Helper instance will be terminated after a given time if it hasn't exited by
 # itself. The time to wait before killing the process is specified by those
 # variables. When soft/hard limit expires, a SIGTERM/SIGKILL is sent.
-# HELPER_SOFT_TIMEOUT="120"
-# HELPER_HARD_TIMEOUT="15"
+# HELPER_SOFT_TIMEOUT="15"
+# HELPER_HARD_TIMEOUT="5"
 
 # HELPER_USR: For security reasons, the helper vm is not adviced to to run as
 # root. It should drop privileges just before the guest execution starts. The
 # user the helper vm should run as is specifies by HELPER_USR variable.
 # HELPER_USER="nobody"
 
+# HELPER_CACHE_FILE: Cache file update-helper script uses to avoid running
+# `debootstrap' all the time.
+# HELPER_CACHE_FILE="$(HELPER_DIR)/cache.tar"
+
+# HELPER_EXTRA_PKGS: Extra packages that will need to be supplied to de supplied
+# to debootstrap to make the resulting helper image workable
+# HELPER_EXTRA_PKGS="linux-image-amd64,e2fsprogs,ntfs-3g,ntfsprogs,xmlstarlet,python"
+
 # Paths for needed programs. Uncommend and change the variables below, if you
 # don't want to use the default one.
 # LOSETUP="losetup"
 # KPARTX="kpartx"
 # SFDISK="sfdisk"
+# QEMU_IMG="qemu-img"
 # INSTALL_MBR="install-mbr"
 # TIMELIMIT="timelimit"
-# if [ "$windows_support" = "yes" ] ; then
-#     PROGRESS_MONITOR="snf-progress-monitor"
-# fi
+# PROGRESS_MONITOR="snf-progress-monitor"