Comment 1 for bug 254966

Revision history for this message
Michael Vogt (mvo) wrote :

Here is the debdiff:

diff -Nru ubuntu-vm-builder-0.4/debian/changelog ubuntu-vm-builder-0.4/debian/changelog
--- ubuntu-vm-builder-0.4/debian/changelog 2008-06-04 16:33:48.000000000 +0200
+++ ubuntu-vm-builder-0.4/debian/changelog 2008-08-05 14:59:58.000000000 +0200
@@ -1,3 +1,12 @@
+ubuntu-vm-builder (0.4-0ubuntu0.4) hardy-proposed; urgency=low
+
+ * revert change in behavior from 0.4-0ubuntu0.1 and 0.4-0ubuntu0.2
+ for the --ssh-key option. It used to add a ssh key for root logins,
+ but with that version it changes that to a $VMUSER login.
+ This change restores the old (hardy-final) behavior (LP: #254966)
+
+ -- Michael Vogt <email address hidden> Tue, 05 Aug 2008 14:50:33 +0200
+
 ubuntu-vm-builder (0.4-0ubuntu0.3) hardy-proposed; urgency=low

   * Add --in-place option that will allow ubuntu-vm-builder to function when
diff -Nru ubuntu-vm-builder-0.4/ubuntu-vm-builder ubuntu-vm-builder-0.4/ubuntu-vm-builder
--- ubuntu-vm-builder-0.4/ubuntu-vm-builder 2008-06-03 14:09:49.000000000 +0200
+++ ubuntu-vm-builder-0.4/ubuntu-vm-builder 2008-08-05 15:00:59.000000000 +0200
@@ -114,7 +114,7 @@
                    if your \$TMPDIR is nodev and/or nosuid, but will result in
                    slightly larger file system images.
 --ssh-key Add the given ssh public key file (absolute path)
- to user's authorized keys and install openssh-server
+ to root's authorized keys and install openssh-server
                    (WARNING: this has strong security implications)
 --exec Run the given script file. You can use
                    'chroot root <cmd>' to execute code in the guest.
@@ -794,9 +794,8 @@
        fi
        # we have a key, add it
        chroot root apt-get install --force-yes -y openssh-server
- mkdir root/home/$VMUSER/.ssh
- cp "$SSHKEY" root/home/$VMUSER/.ssh/authorized_keys
- chroot root chown -R $VMUSER:$VMUSER /home/$VMUSER/.ssh
+ mkdir root/root/.ssh
+ cp "$SSHKEY" root/root/.ssh/authorized_keys
 }

 do_sourceslist () {