fix ssh_merge_keys

diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm
index b11db9e80178528e5455e19e786864f8dbae7d25..d9045ccf420e8bb67a1b4e9be6d292325c5dd1a0 100644 (file)
--- a/data/PVE/Cluster.pm
+++ b/data/PVE/Cluster.pm
@@ -1013,6 +1013,7 @@ sub ssh_merge_keys {
 
     my $found_backup;
     if (-f $rootsshauthkeysbackup) {
+       $data .= "\n";
        $data .= PVE::Tools::file_get_contents($rootsshauthkeysbackup, 128*1024);
        chomp($data);
        $found_backup = 1;
@@ -1083,7 +1084,7 @@ sub setup_ssh_keys {
     warn "can't create shared ssh key database '$sshauthkeys'\n" 
        if ! -f $sshauthkeys;
 
-    if (-f $rootsshauthkeys) {
+    if (-f $rootsshauthkeys && ! -l $rootsshauthkeys) {
        if (!rename($rootsshauthkeys , $rootsshauthkeysbackup)) {
            warn "rename $rootsshauthkeys failed - $!\n";
        }

diff --git a/debian/changelog b/debian/changelog
index 4cf4f8dc4fbe32258e4c3358c8852e2730cbd869..afe3edeb051f6f8c8878f6dfd6b17f2dfddab0e7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pve-cluster (1.0-34) unstable; urgency=low
 
   * implement sendfd to support qemu fdset functionality.
+  
+  * fix ssh_merge_keys
 
  -- Proxmox Support Team <support@proxmox.com>  Wed, 05 Dec 2012 12:02:09 +0100