[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-191-g34c4c59

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit c2564e73dd7186a4ca4a37d3904e2f5a21782f13
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 10 01:11:30 2013 +0100

    p-s.deb: populate known_hosts with localhost's key
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 1e61e98..3784bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,6 +96,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * piuparts-slave.deb:
     - Use /var/cache/piuparts/tmp as tmpdir.
     - Use /var/cache/piuparts/basetgz as basetgz-directory.
+    - Populate ~piupartss/.ssh/known_hosts with localhost's hostkey.
   * slave_{run,join}: Rename the screen session to "piuparts_slave_screen".
   * slave_cleanup: Use pgrep to find running piuparts-slave processes.
   * slave_{run,join}: Use screen -ls to find running screen sessions.
diff --git a/debian/piuparts-slave.postinst b/debian/piuparts-slave.postinst
index 0416afb..6ef46d0 100644
--- a/debian/piuparts-slave.postinst
+++ b/debian/piuparts-slave.postinst
@@ -49,7 +49,12 @@ if [ "$1" = "configure" ] ; then
               $userhome/$suser/.ssh/id_rsa.pub
     fi
 
-    if [ -d $userhome/$muser/.ssh ] ; then
+    if [ ! -e $userhome/$suser/.ssh/known_hosts ] ; then
+        ssh-keyscan localhost > $userhome/$suser/.ssh/known_hosts 2>/dev/null
+        chown $suser:$pgroup $userhome/$suser/.ssh/known_hosts
+    fi
+
+    if [ -d $userhome/$muser/.ssh ] && [ ! -e $userhome/$muser/.ssh/authorized_keys ] ; then
         cat $userhome/$suser/.ssh/id_rsa.pub >>$userhome/$muser/.ssh/authorized_keys
         chown $muser:$pgroup $userhome/$muser/.ssh/authorized_keys
         chmod 0600 $userhome/$muser/.ssh/authorized_keys

-- 
piuparts git repository