Merge lp:~benji/ubuntu/precise/lxc/bug-945183 into lp:ubuntu/precise/lxc

[Benji York]

This fixes bug 945183 by adding -u (--user) and -S (--ssh-key) options.

[Serge Hallyn (serge-hallyn)]

Thanks, looks great.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-28 15:03:45 +0000
+++ debian/changelog	2012-03-02 22:26:20 +0000
@@ -1,3 +1,9 @@
+lxc (0.7.5-3ubuntu32) precise; urgency=low
+
+  * add user (-u) and key (-S) to lxc-start-ephemeral.  (LP: #945183)
+
+ -- benji <[e-mail]>  Fri, 02 Mar 2012 17:20:46 -0500
+
 lxc (0.7.5-3ubuntu31) precise; urgency=low
 
   * 0050-clone-lvm-sizes: make lxc-clone with lvm snapshots create a
 
=== modified file 'debian/local/lxc-start-ephemeral' (properties changed: -x to +x)
--- debian/local/lxc-start-ephemeral	2012-02-16 16:47:03 +0000
+++ debian/local/lxc-start-ephemeral	2012-03-02 22:26:20 +0000
@@ -8,7 +8,7 @@
 LXC_BIND=""
 
 usage() {
-    echo "usage: lxc-start-ephemeral [-h] [-b bdir] -o orig -- [COMMAND [ARGS...]]"
+    echo "usage: lxc-start-ephemeral [-h] [-b bdir] [-u user] [-S key] -o orig -- [COMMAND [ARGS...]]"
 }
 
 help() {
@@ -19,13 +19,15 @@
     echo "Options:"
     echo "orig        : name of the original container"
     echo "bdir        : directory to bind mount into container"
+    echo "user        : the user to connect to the container as"
+    echo "key         : the path to the SSH key to use to connect"
     echo
     echo "if a COMMAND is given, then the container will run only as long"
     echo "as the command runs.  If no COMMAND is given, this command will"
     echo "wait until the container is shut down"
 }
 
-shortoptions='hb:o:'
+shortoptions='hb:o:u:S:'
 longoptions='help,orig:,bdir:'
 
 LXC_RUNNING=0
@@ -74,6 +76,16 @@
 		LXC_BIND=$1
 		shift
 		;;
+	    -u|--user)
+		shift
+		LXC_USER=$1
+		shift
+		;;
+	    -S|--ssh-key)
+		shift
+		LXC_KEY="-i $1"
+		shift
+		;;
             --)
 		shift
 		break;;
@@ -85,7 +97,7 @@
         esac
 done
 
-LXC_USER=`id -un`
+LXC_USER=${LXC_USER:-`id -un`}
 
 # validation
 
@@ -144,7 +156,7 @@
             # Repeatedly try to connect over SSH until we either succeed
             # or time out.
             for i in $(seq 1 30); do
-	        ssh -n -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $LXC_USER@$IP_ADDRESS -- "$@"
+	        ssh -n -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $LXC_KEY $LXC_USER@$IP_ADDRESS -- "$@"
                 if [ ! 255 -eq $? ]; then
                     # If ssh returns 255 then its connection failed.
                     # Anything else is either success (status 0) or a