lxc-busybox: make some OpenSSH tools optional

Currently, when installing OpenSSH in a Busybox container, the template searches
for all the OpenSSH client binaries available in the Debian distro package. The
included tools might differ from distro to distro, so make part of the tools
optional. The mandatory tools, without which installing OpenSSH fails, are
"sshd" for the server and "ssh" and "scp" for the client.

Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index 95961a334375b8ccce32e5fffc7234650fcbe3de..17a3006d172d45225c1a166b307fc33e262d656a 100644 (file)
--- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in
@@ -197,6 +197,8 @@ install_openssh()
     client_utils="\
         ssh \
         scp \
+        "
+    client_optional_utils="\
         sftp \
         ssh-add \
         ssh-agent \
@@ -230,6 +232,13 @@ $rootfs/var/run/sshd \
         fi
     done
 
+    for bin in $client_optional_utils; do
+        tool_path=`which $bin`
+        if [ $? -eq 0 ]; then
+            cp $tool_path $rootfs/$tool_path
+        fi
+    done
+
     # add user and group
     cat <<EOF >> $rootfs/etc/passwd
 sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin