Minor fixes in helper's tasks

diff --git a/snf-image-helper/common.sh b/snf-image-helper/common.sh
index 8b29379..5b3fbc8 100644 (file)
--- a/snf-image-helper/common.sh
+++ b/snf-image-helper/common.sh
@@ -159,7 +159,6 @@ cleanup() {
   fi
 }
 
-trap cleanup EXIT
 
 check_if_excluded() {
 
@@ -174,6 +173,8 @@ check_if_excluded() {
     return 0
 }
 
+trap cleanup EXIT
+
 # Check if the execution of a task should be ommited
 check_if_excluded
 

diff --git a/snf-image-helper/tasks/30MountImage.in b/snf-image-helper/tasks/30MountImage.in
index ed62419..62115ad 100644 (file)
--- a/snf-image-helper/tasks/30MountImage.in
+++ b/snf-image-helper/tasks/30MountImage.in
@@ -17,7 +17,7 @@ if [ ! -b "$SNF_IMAGE_ROOTDEV" ]; then
     log_error "Device file:\`$SNF_IMAGE_ROOTDEV' is not a block device"
 fi
 
-mount "$SNF_IMAGE_ROOTDEV" "$SNF_IMAGE_TARGET"
+mount "$SNF_IMAGE_ROOTDEV" "$SNF_IMAGE_TARGET" -o rw
 
 exit 0
 

diff --git a/snf-image-helper/tasks/40DeleteSSHKeys.in b/snf-image-helper/tasks/40DeleteSSHKeys.in
index b6f5e32..2707b8c 100644 (file)
--- a/snf-image-helper/tasks/40DeleteSSHKeys.in
+++ b/snf-image-helper/tasks/40DeleteSSHKeys.in
@@ -14,11 +14,7 @@ if [ ! -d "$SNF_IMAGE_TARGET" ]; then
     log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing."
 fi
 
-target="$SNF_IMAGE_TARGET"
-
 if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" != "linux" ]; then
-    cleanup
-    trap - EXIT
     exit 0
 fi
 
@@ -29,6 +25,7 @@ RSA_KEY="/etc/ssh/ssh_host_rsa_key"
 DSA_KEY="/etc/ssh/ssh_host_dsa_key"
 ECDSA_KEY="/etc/ssh/ssh_host_ecdsa_key"
 
+target="$SNF_IMAGE_TARGET"
 
 #Remove the default keys
 for pair in "$HOST_KEY@rsa1" "$RSA_KEY@rsa" "$DSA_KEY@dsa" "$ECDSA_KEY@ecdsa"; do
@@ -48,8 +45,6 @@ config="$target/etc/ssh/sshd_config"
 if [ ! -e "$config" ]; then
     echo "Warning: Config file: \`$config' is missing."
     echo "Warning: Can't check for non-default keys."
-    cleanup
-    trap - EXIT
     exit 0
 fi
 
@@ -93,9 +88,6 @@ grep ^HostKey "$config" | while read key_line; do
     fi
 done
 
-cleanup
-trap - EXIT
-
 exit 0
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

diff --git a/snf-image-helper/tasks/40FilesystemResizeMounted.in b/snf-image-helper/tasks/40FilesystemResizeMounted.in
index 795d3f6..29cdb21 100644 (file)
--- a/snf-image-helper/tasks/40FilesystemResizeMounted.in
+++ b/snf-image-helper/tasks/40FilesystemResizeMounted.in
@@ -14,6 +14,10 @@ if [ ! -d "$SNF_IMAGE_TARGET" ]; then
     log_error "Target directory \`$SNF_IMAGE_TARGET' is missing"
 fi
 
+if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" != "windows" ]; then
+    exit 0
+fi
+
 last_partition=$(get_last_partition "$SNF_IMAGE_DEV")
 id=$(echo "$last_partition" | cut -d: -f1)
 ptype=$(echo "$last_partition" | cut -d: -f5)
@@ -30,9 +34,6 @@ exit
 EOF
 fi
 
-cleanup
-trap - EXIT
-
 exit 0
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

diff --git a/snf-image-helper/tasks/50AssignHostname.in b/snf-image-helper/tasks/50AssignHostname.in
index 5109355..65e20bf 100644 (file)
--- a/snf-image-helper/tasks/50AssignHostname.in
+++ b/snf-image-helper/tasks/50AssignHostname.in
@@ -68,9 +68,6 @@ elif [ "$SNF_IMAGE_PROPERTY_OSFAMILY" = "linux" ]; then
     linux_hostname "$SNF_IMAGE_TARGET" "$SNF_IMAGE_HOSTNAME"
 fi
 
-cleanup
-trap - EXIT
-
 exit 0
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

diff --git a/snf-image-helper/tasks/50ChangePassword.in b/snf-image-helper/tasks/50ChangePassword.in
index ab1e376..e988b35 100644 (file)
--- a/snf-image-helper/tasks/50ChangePassword.in
+++ b/snf-image-helper/tasks/50ChangePassword.in
@@ -82,9 +82,6 @@ fi
 
 echo "done"
 
-cleanup
-trap - EXIT
-
 exit 0
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

diff --git a/snf-image-helper/tasks/80UmountImage.in b/snf-image-helper/tasks/80UmountImage.in
index fde3e27..5b6b497 100644 (file)
--- a/snf-image-helper/tasks/80UmountImage.in
+++ b/snf-image-helper/tasks/80UmountImage.in
@@ -16,9 +16,6 @@ fi
 
 umount "$SNF_IMAGE_TARGET"
 
-cleanup
-trap - EXIT
-
 exit 0
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :