From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 30 Oct 2013 08:40:26 +0000 (+0200)
Subject: Fix DeleteSSHKeys to work on non-linux systems
X-Git-Tag: 0.12~1^2~2^2~9
X-Git-Url: https://code.grnet.gr/git/snf-image/commitdiff_plain/62e97e7f06ef020adafdfb547fa35c1cf2501852

Fix DeleteSSHKeys to work on non-linux systems
---

diff --git a/snf-image-helper/tasks/40DeleteSSHKeys.in b/snf-image-helper/tasks/40DeleteSSHKeys.in
index 90bc739..a6dbc16 100644
--- a/snf-image-helper/tasks/40DeleteSSHKeys.in
+++ b/snf-image-helper/tasks/40DeleteSSHKeys.in
@@ -41,7 +41,9 @@ if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" = "windows" ]; then
     exit 0
 fi
 
-distro=$(get_base_distro "$SNF_IMAGE_TARGET")
+if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" = "linux" ]; then
+    distro=$(get_base_distro "$SNF_IMAGE_TARGET")
+fi
 
 HOST_KEY="/etc/ssh/ssh_host_key"
 RSA_KEY="/etc/ssh/ssh_host_rsa_key"
@@ -50,10 +52,12 @@ ECDSA_KEY="/etc/ssh/ssh_host_ecdsa_key"
 
 target="$SNF_IMAGE_TARGET"
 
-mount -o bind /proc "$target/proc"
-add_cleanup umount "$target/proc"
-mount -o bind /dev "$target/dev"
-add_cleanup umount "$target/dev"
+if [ "x$distro" = "xdebian" ]; then
+    mount -o bind /proc "$target/proc"
+    add_cleanup umount "$target/proc"
+    mount -o bind /dev "$target/dev"
+    add_cleanup umount "$target/dev"
+fi
 
 #Remove the default keys
 for pair in "$HOST_KEY@rsa1" "$RSA_KEY@rsa" "$DSA_KEY@dsa" "$ECDSA_KEY@ecdsa"; do