From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 9 Nov 2015 11:38:57 +0000 (+0100)
Subject: same as previous change : ignore error when producing the rsa1 ssh key
X-Git-Tag: bootmanager-5.3-2~2
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=1271271fc0d7271293ddd014b06d3c4b3d83ec3b

same as previous change : ignore error when producing the rsa1 ssh key
---

diff --git a/source/steps/StartDebug.py b/source/steps/StartDebug.py
index fc403e6..598121f 100644
--- a/source/steps/StartDebug.py
+++ b/source/steps/StartDebug.py
@@ -83,19 +83,26 @@ def Run(vars, log, last_resort = True):
         utils.makedirs (ssh_dir)
 
     # original code used to specify -b 1024 for the rsa1 key
+    # fedora23 seems to come with a release of openssh that lacks suppport
+    # for ssh1, and thus rsa1 keys; so we consider that failing to produce
+    # the rsa1 key is not a showstopper
     key_specs = [
-        ("/etc/ssh/ssh_host_key",     'rsa1', "SSH1 RSA"),
-        ("/etc/ssh/ssh_host_rsa_key", 'rsa',  "SSH2 RSA"),
-        ("/etc/ssh/ssh_host_dsa_key", 'dsa',  "SSH2 DSA"),
+        ("/etc/ssh/ssh_host_key",     'rsa1', "SSH1 RSA", False),
+        ("/etc/ssh/ssh_host_rsa_key", 'rsa',  "SSH2 RSA", True),
+        ("/etc/ssh/ssh_host_dsa_key", 'dsa',  "SSH2 DSA", True),
     ]
 
-    for key_file, key_type, label in key_specs:
+    for key_file, key_type, label, mandatory in key_specs:
         if not os.path.exists(key_file):
             log.write("Creating {} host key {}\n".format(label, key_file))
-            utils.sysexec("{} -q -t {} -f {} -C '' -N ''"\
-                                 .format(key_gen_prog, key_type, key_file), log)
-            utils.sysexec("chmod 600 {}".format(key_file), log)
-            utils.sysexec("chmod 644 {}.pub".format(key_file), log)
+            if mandatory:
+                run = utils.sysexec
+            else:
+                run = utils.sysexec_noerr
+            run("{} -q -t {} -f {} -C '' -N ''"\
+                .format(key_gen_prog, key_type, key_file), log)
+            run("chmod 600 {}".format(key_file), log)
+            run("chmod 644 {}.pub".format(key_file), log)
 
     # (over)write sshd config
     utils.sysexec("cp -f {}/sshd_config {}/sshd_config".format(ssh_source_files, ssh_dir), log)