Mount /dev & /proc in the helper before chrooting

diff --git a/snf-image-helper/tasks/40DeleteSSHKeys.in b/snf-image-helper/tasks/40DeleteSSHKeys.in
index 9b80630..dc713a5 100644 (file)
--- a/snf-image-helper/tasks/40DeleteSSHKeys.in
+++ b/snf-image-helper/tasks/40DeleteSSHKeys.in
@@ -50,6 +50,11 @@ 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"
+
 #Remove the default keys
 for pair in "$HOST_KEY@rsa1" "$RSA_KEY@rsa" "$DSA_KEY@dsa" "$ECDSA_KEY@ecdsa"; do
     key=$(echo $pair | cut -d@ -f1)

diff --git a/snf-image-helper/tasks/60EnforcePersonality.in b/snf-image-helper/tasks/60EnforcePersonality.in
index 06d0b49..3780c37 100644 (file)
--- a/snf-image-helper/tasks/60EnforcePersonality.in
+++ b/snf-image-helper/tasks/60EnforcePersonality.in
@@ -48,6 +48,11 @@ if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" = "windows" ]; then
         @scriptsdir@/inject-files.py "$SNF_IMAGE_TARGET"
     exit 0
 elif [ "$SNF_IMAGE_PROPERTY_OSFAMILY" = "linux" ]; then
+    mount -o bind /proc "$SNF_IMAGE_TARGET/proc"
+    add_cleanup umount "$SNF_IMAGE_TARGET/proc"
+    mount -o bind /dev "$SNF_IMAGE_TARGET/dev"
+    add_cleanup umount "$SNF_IMAGE_TARGET/dev"
+
     tmpdir=$(chroot "$SNF_IMAGE_TARGET" mktemp -d)
     add_cleanup rm -rf "$SNF_IMAGE_TARGET/$tmpdir"
     echo "$SNF_IMAGE_PERSONALITY" |