Merge lp:~corey.bryant/curtin/README into lp:~curtin-dev/curtin/trunk

[Corey Bryant]

=== modified file 'curtin/commands/install.py'
--- curtin/commands/install.py	2013-09-19 21:01:27 +0000
+++ curtin/commands/install.py	2014-03-24 19:18:58 +0000
@@ -19,6 +19,7 @@
 import json
 import os
 import re
+import shlex
 import shutil
 import tempfile
 
@@ -158,6 +159,69 @@
 
     return (['sh', '-c', shcmd, 'curtin-poweroff', delay] + args)
 
+def apply_kexec(kexec, target):
+    # load kexec kernel from target directory, similar to /etc/init.d/kexec-load
+    # kexec:
+    #  mode: on
+    grubcfg = "boot/grub/grub.cfg"
+    target_grubcfg = os.path.join(target, grubcfg)
+
+    if kexec is None or kexec.get("mode") != "on":
+        return False
+
+    if not isinstance(kexec, dict):
+        raise TypeError("kexec is not a dict.")
+
+    if not util.which('kexec'):
+        util.subp(args=['apt-get', 'install', 'kexec-tools', '--assume-yes',
+                        '--quiet'])
+
+    if not os.path.isfile(target_grubcfg):
+        raise ValueError("%s does not exist in target" % grubcfg)
+
+    with open(target_grubcfg, "r") as fp:
+        default = 0
+        menu_lines = []
+
+        # get the default grub boot entry number and menu entry line numbers
+        for line_num, line in enumerate(fp, 1):
+            if re.search(r"set default=\"[0-9]+\"", line):
+                default = int(re.sub(r"[^0-9]", '', line))
+            if re.match(r"menuentry", line):
+                menu_lines.append(line_num)
+
+        if not menu_lines:
+            LOG.error("grub config file does not have a menuentry\n")
+            return False
+
+        # get the begin and end line numbers for default menuentry section,
+        # using end of file if it's the last menuentry section
+        begin = menu_lines[default]
+        if begin != menu_lines[-1]:
+            end = menu_lines[default + 1] - 1
+        else:
+            end = line_num
+
+        fp.seek(0)
+        lines = fp.readlines()
+        kernel = append = initrd = ""
+
+        for i in range(begin, end):
+            if 'linux' in lines[i]:
+                split_line = shlex.split(lines[i])
+                kernel = target + split_line[1]
+                append = "--append=" + ' '.join(split_line[2:])
+            if 'initrd' in lines[i]:
+                split_line = shlex.split(lines[i])
+                initrd = "--initrd=" + target + split_line[1]
+
+        if not kernel:
+            LOG.error("grub config file does not have a kernel\n")
+            return False
+
+        LOG.debug("kexec -l %s %s %s" % (kernel, append, initrd))
+        util.subp(args=['kexec', '-l', kernel, append, initrd])
+        return True
 
 def cmd_install(args):
     cfg = CONFIG_BUILTIN
@@ -191,6 +255,10 @@
                 stage = Stage(name, cfg.get(commands_name, {}), env)
                 stage.run()
 
+        if apply_kexec(cfg.get('kexec'), workingd.target):
+            cfg['power_state'] = {'mode': 'reboot', 'delay': 'now',
+                                  'message': "'rebooting with kexec'"}
+
     finally:
         for d in ('sys', 'dev', 'proc'):
             util.do_umount(os.path.join(workingd.target, d))

=== modified file 'doc/devel/README.txt'
--- doc/devel/README.txt	2014-01-29 16:20:44 +0000
+++ doc/devel/README.txt	2014-03-24 19:18:58 +0000
@@ -35,7 +35,7 @@
 cd ~/src/curtin/trunk
 # use 'launch' to launch a kvm instance with user data to pack
 # up local curtin and run it inside instance.
-./tools/launch $BOOTIMG --publish $ROOTTGZ curtin install "PUBURL/${ROOTTGZ##*/}"
+./tools/launch $BOOTIMG --publish $ROOTTGZ -- curtin install "PUBURL/${ROOTTGZ##*/}"
 
 ## notes about 'launch' ##
  * launch has --help so you can see that for some info.