X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FStartDebug.py;h=f913dc800eadd3bc6227c486ddf83bb0a6a71664;hb=f34ef1af6e4ba70e19c943ac3ef388675998b3f8;hp=65af3f1705d688713bad3082aaf1147ebaf04d13;hpb=301b70f93100d8775e034e7c2afe59660f7e3870;p=bootmanager.git

diff --git a/source/steps/StartDebug.py b/source/steps/StartDebug.py
index 65af3f1..f913dc8 100644
--- a/source/steps/StartDebug.py
+++ b/source/steps/StartDebug.py
@@ -68,6 +68,7 @@ def Run(vars, log, last_resort = True):
     # constants
     ssh_source_files = "%s/debug_files/" % BM_SOURCE_DIR    
     ssh_dir = "/etc/ssh/"
+    key_gen_prog = "ssh-keygen"
     ssh_home = "/root/.ssh"
     cancel_boot_flag = "/tmp/CANCEL_BOOT"
     sshd_started_flag = "/tmp/SSHD_RUNNING"
@@ -80,22 +81,31 @@ def Run(vars, log, last_resort = True):
     # create host keys if needed
     if not os.path.isdir (ssh_dir):
         utils.makedirs (ssh_dir)
-    key=ssh_dir+"/ssh_host_key"
-    if not os.path.isfile (key):
-        log.write("Creating host rsa1 key %s\n"%key)
-        utils.sysexec( "ssh-keygen -t rsa1 -b 1024 -f %s -N ''" % key, log )
-    key=ssh_dir+"/ssh_host_rsa_key"
-    if not os.path.isfile (key):
-        log.write("Creating host rsa key %s\n"%key)
-        utils.sysexec( "ssh-keygen -t rsa -f %s -N ''" % key, log )
-    key=ssh_dir+"/ssh_host_dsa_key"
-    if not os.path.isfile (key):
-        log.write("Creating host dsa key %s\n"%key)
-        # very old versions did 'ssh-keygen -d' instead of 'ssh-keygen -t dsa' 
-        utils.sysexec( "ssh-keygen -t dsa -f %s -N ''" % key, log )
+
+    # 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", 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, mandatory in key_specs:
+        if not os.path.exists(key_file):
+            log.write("Creating {} host key {}\n".format(label, key_file))
+            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 %s/sshd_config %s/sshd_config" % (ssh_source_files,ssh_dir), log )
+    utils.sysexec("cp -f {}/sshd_config {}/sshd_config".format(ssh_source_files, ssh_dir), log)
     
     ### xxx ### xxx ### xxx ### xxx ### xxx 
 
@@ -110,7 +120,8 @@ def Run(vars, log, last_resort = True):
     # start sshd
     if not os.path.isfile(sshd_started_flag):
         log.write("Starting sshd\n")
-        utils.sysexec("service sshd start", log)
+        utils.sysexec("service sshd start || systemctl start sshd",
+                      log, shell=True)
         # flag that ssh is running
         utils.sysexec("touch {}".format(sshd_started_flag), log)
     else: