Fix typos, remove reference to $windows_support

diff --git a/snf-image-helper/common.sh b/snf-image-helper/common.sh
index 212dc92..b1a6813 100644 (file)
--- a/snf-image-helper/common.sh
+++ b/snf-image-helper/common.sh
@@ -93,7 +93,7 @@ get_distro() {
 }
 
 cleanup() {
-# if something fails here, it souldn't call cleanup again...
+    # if something fails here, it shouldn't call cleanup again...
     trap - EXIT
 
     if [ ${#CLEANUP[*]} -gt 0 ]; then
@@ -106,7 +106,7 @@ cleanup() {
             # synchronous and may return while the partition is still busy. A
             # premature attempt to delete partition mappings through kpartx on a
             # device that hosts previously mounted ntfs partition may fail with
-            # an  `device-mapper: remove ioctl failed: Device or resource busy'
+            # a `device-mapper: remove ioctl failed: Device or resource busy'
             # error. A sensible workaround for this is to wait for a while and
             # then try again.
             local cmd=${CLEANUP[$i]}

diff --git a/snf-image-helper/snf-passtohash.py b/snf-image-helper/snf-passtohash.py
index a4c6f0f..8b74153 100755 (executable)
--- a/snf-image-helper/snf-passtohash.py
+++ b/snf-image-helper/snf-passtohash.py
@@ -2,11 +2,11 @@
 #
 # Copyright (c) 2011 Greek Research and Technology Network
 #
-"""Generate a Hash from a given Password 
+"""Generate a hash from a given password
 
-This program takes a Password as an argument and
+This program takes a password as an argument and
 returns to standard output a hash followed by a newline.
-To do this, it generates internally a random salt.
+To do this, it generates a random salt internally.
 
 """
 

diff --git a/snf-image-helper/tasks/10ResizeUnmounted.in b/snf-image-helper/tasks/10ResizeUnmounted.in
index 870715c..f87ccff 100644 (file)
--- a/snf-image-helper/tasks/10ResizeUnmounted.in
+++ b/snf-image-helper/tasks/10ResizeUnmounted.in
@@ -4,7 +4,7 @@
 # Provides:            ResizeUnmounted
 # RunBefore:           MountImage
 # Short-Description:   Resize filesystem to use all the available space
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/30MountImage.in b/snf-image-helper/tasks/30MountImage.in
index 10eca6e..9a893e0 100644 (file)
--- a/snf-image-helper/tasks/30MountImage.in
+++ b/snf-image-helper/tasks/30MountImage.in
@@ -4,7 +4,7 @@
 # Provides:            MountImage
 # RunBefore:           UmountImage
 # Short-Description:   Mount the partition that hosts the image
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/40AddDeleteUnattendScript.in b/snf-image-helper/tasks/40AddDeleteUnattendScript.in
index 57af6be..9dbbeb9 100644 (file)
--- a/snf-image-helper/tasks/40AddDeleteUnattendScript.in
+++ b/snf-image-helper/tasks/40AddDeleteUnattendScript.in
@@ -5,7 +5,7 @@
 # RunBefore:           UmountImage
 # RunAfter:            MountImage
 # Short-Description:   Script that removes Unattend.xml after setup has finished
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/40DeleteSSHKeys.in b/snf-image-helper/tasks/40DeleteSSHKeys.in
index 77e3dbb..4f65ee3 100644 (file)
--- a/snf-image-helper/tasks/40DeleteSSHKeys.in
+++ b/snf-image-helper/tasks/40DeleteSSHKeys.in
@@ -4,7 +4,7 @@
 # Provides:            DeleteSSHKeys
 # Requires:             MountImage
 # Short-Description:   Remove ssh keys if present.
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/40InstallUnattend.in b/snf-image-helper/tasks/40InstallUnattend.in
index 795e5e7..5cf6951 100644 (file)
--- a/snf-image-helper/tasks/40InstallUnattend.in
+++ b/snf-image-helper/tasks/40InstallUnattend.in
@@ -5,7 +5,7 @@
 # RunBefore:           UmountImage
 # RunAfter:            MountImage
 # Short-Description:   Installs Unattend.xml for unattended windows setup
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/40ResizeMounted.in b/snf-image-helper/tasks/40ResizeMounted.in
index d46fe14..d0c699b 100644 (file)
--- a/snf-image-helper/tasks/40ResizeMounted.in
+++ b/snf-image-helper/tasks/40ResizeMounted.in
@@ -5,7 +5,7 @@
 # RunBefore:            UmountImage
 # RunAfter:            MountImage
 # Short-Description:   Resize filesystem to use all the available space
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/40SELinuxAutorelabel.in b/snf-image-helper/tasks/40SELinuxAutorelabel.in
index 2836ac2..fdd731f 100644 (file)
--- a/snf-image-helper/tasks/40SELinuxAutorelabel.in
+++ b/snf-image-helper/tasks/40SELinuxAutorelabel.in
@@ -5,7 +5,7 @@
 # RunBefore:            UmountImage
 # RunAfter:             MountImage
 # Short-Description:   Force the system to relabel at next boot
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/50AssignHostname.in b/snf-image-helper/tasks/50AssignHostname.in
index 3c11246..fa7d0ba 100644 (file)
--- a/snf-image-helper/tasks/50AssignHostname.in
+++ b/snf-image-helper/tasks/50AssignHostname.in
@@ -5,7 +5,7 @@
 # RunBefore:            UmountImage
 # RunAfter:            InstallUnattend
 # Short-Description:   Assign the Hostname of Computer Name in the instance
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/50ChangePassword.in b/snf-image-helper/tasks/50ChangePassword.in
index f8bb7c3..36f7e2b 100644 (file)
--- a/snf-image-helper/tasks/50ChangePassword.in
+++ b/snf-image-helper/tasks/50ChangePassword.in
@@ -5,7 +5,7 @@
 # RunBefore:            UmountImage
 # RunAfter:            InstallUnattend
 # Short-Description:   Changes Password for specified users
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-helper/tasks/80UmountImage.in b/snf-image-helper/tasks/80UmountImage.in
index c39d3eb..fde3e27 100644 (file)
--- a/snf-image-helper/tasks/80UmountImage.in
+++ b/snf-image-helper/tasks/80UmountImage.in
@@ -5,7 +5,7 @@
 # RunBefore:
 # RunAfter:            MountImage
 # Short-Description:   Umount the partition that hosts the image
-### END TAST INFO
+### END TASK INFO
 
 set -e
 . "@commondir@/common.sh"

diff --git a/snf-image-host/defaults b/snf-image-host/defaults
index ab3a543..027c2ba 100644 (file)
--- a/snf-image-host/defaults
+++ b/snf-image-host/defaults
@@ -59,6 +59,4 @@
 # 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"