when generating keys inside the bootcd environment, ignore errors about the rsa1...

[bootmanager.git] / source / steps / InstallWriteConfig.py

diff --git a/source/steps/InstallWriteConfig.py b/source/steps/InstallWriteConfig.py
index 98167f9..381e9b1 100644 (file)
--- a/source/steps/InstallWriteConfig.py
+++ b/source/steps/InstallWriteConfig.py
@@ -80,16 +80,16 @@ def Run(vars, log):
     log.write("Writing system /etc/fstab\n")
     fstab = file("{}/etc/fstab".format(SYSIMG_PATH), "w")
     fstab.write("{}           none        swap      sw        0 0\n"\
-                .format(PARTITIONS["mapper-swap"]))
+                .format(PARTITIONS["swap"]))
     fstab.write("{}           /           ext3      defaults  1 1\n"\
-                .format(PARTITIONS["mapper-root"]))
+                .format(PARTITIONS["root"]))
     if (vars['ONE_PARTITION'] != '1'):
         if vars['virt'] == 'vs':
             fstab.write("{}           /vservers   ext3      tagxid,defaults  1 2\n"\
-                        .format(PARTITIONS["mapper-vservers"]))
+                        .format(PARTITIONS["vservers"]))
         else:
             fstab.write("{}           /vservers   btrfs     defaults  1 2\n"\
-                        .format(PARTITIONS["mapper-vservers"]))
+                        .format(PARTITIONS["vservers"]))
     fstab.write("none         /proc       proc      defaults  0 0\n")
     fstab.write("none         /dev/shm    tmpfs     defaults  0 0\n")
     fstab.write("none         /dev/pts    devpts    defaults  0 0\n")
@@ -123,7 +123,7 @@ def Run(vars, log):
     if method == "dhcp":
         utils.sysexec("cp /etc/resolv.conf {}/etc/".format(SYSIMG_PATH), log)
 
-    log.write("Writing node install version\n")
+    log.write("Writing node install_version\n")
     utils.makedirs("{}/etc/planetlab".format(SYSIMG_PATH))
     ver = file("{}/etc/planetlab/install_version".format(SYSIMG_PATH), "w")
     ver.write("{}\n".format(VERSION))
@@ -133,19 +133,29 @@ def Run(vars, log):
     log.write("Creating ssh host keys\n")
     key_gen_prog = "/usr/bin/ssh-keygen"
 
+    # 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:
         abs_file = "{}/{}".format(SYSIMG_PATH, key_file)
         if not os.path.exists(abs_file):
-            log.write("Generating {} host key {}\n".format(label, key_file))
-            utils.sysexec_chroot(SYSIMG_PATH, "{} -q -t {} -f {} -C '' -N ''"\
-                                 .format(key_gen_prog, key_type, key_file), log)
-            utils.sysexec("chmod 600 {}/{}".format(SYSIMG_PATH, key_file), log)
-            utils.sysexec("chmod 644 {}/{}.pub".format(SYSIMG_PATH, key_file), log)
-
+            log.write("Generating {} host key {} (mandatory success={})\n"
+                      .format(label, key_file, mandatory))
+            if mandatory:
+                run = utils.sysexec
+                run_chroot = utils.sysexec_chroot
+            else:
+                run = utils.sysexec_noerr
+                run_chroot = utils.sysexec_chroot_noerr
+            run_chroot(SYSIMG_PATH, "{} -q -t {} -f {} -C '' -N ''"\
+                                    .format(key_gen_prog, key_type, key_file), log)
+            run("chmod 600 {}/{}".format(SYSIMG_PATH, key_file), log)
+            run("chmod 644 {}/{}.pub".format(SYSIMG_PATH, key_file), log)
+                
     return 1