Merge lp:~craig.magina/junk/pandakit into lp:~racb/junk/pandakit

[Craig Magina]

Merged all changes made locally

[lp:~craig.magina/junk/pandakit]

95. By Craig Magina on 2013-11-06

Added configuration fields to specify raw power on and off commands for ipmi
Merged local changes

96. By Craig Magina on 2013-12-18

* Fixed a bug with the SSH global defines in toecap
* Minor cleanup from merge that broke installs
* Added new files in debian/install
* Added new recommends on conserver

97. By Craig Magina on 2014-02-07

Applied Massimo's sentrysnmp changes to support the cdu's user in 1ss

Unmerged revisions

97. By Craig Magina on 2014-02-07

Applied Massimo's sentrysnmp changes to support the cdu's user in 1ss

96. By Craig Magina on 2013-12-18

* Fixed a bug with the SSH global defines in toecap
* Minor cleanup from merge that broke installs
* Added new files in debian/install
* Added new recommends on conserver

95. By Craig Magina on 2013-11-06

Added configuration fields to specify raw power on and off commands for ipmi
Merged local changes

94. By Craig Magina on 2013-10-29

Merged all modifications from local system

=== added file 'armadaxp-install.expect'
--- armadaxp-install.expect	1970-01-01 00:00:00 +0000
+++ armadaxp-install.expect	2014-02-07 20:43:02 +0000
@@ -0,0 +1,46 @@
+#!/usr/bin/expect -f
+
+set hostname [lindex $argv 0]
+spawn /usr/lib/pandakit/console-rw $hostname
+set timeout 30
+expect {
+    -ex "Hit any key to stop autoboot:" {send "\n"}
+    timeout {send_user "timed out\n"; exit 1}
+}
+expect {
+    -ex "Marvell>> " {sleep 2;send "dhcp\n"}
+    timeout {send_user "timed out\n"; exit 1}
+}
+expect {
+    timeout {send_user "timed out\n"; exit 1}
+    -ex "egiga0 mvNetaPortEnable failed" {send_user "known race\n"; exit 75}
+    -ex "Retry count exceeded" {send_user "bootp error\n"; exit 1}
+    -ex "DHCP client bound to address"
+}
+expect { 
+    -ex "Marvell>> " {send "pxe get\n"}
+    timeout {send_user "timed out\n"; exit 1}
+}
+expect { 
+    -ex "Marvell>> " {send "pxe boot\n"}
+    timeout {send_user "timed out\n"; exit 1}
+}
+expect {
+    timeout {send_user "timed out\n"; exit 1}
+    -ex "Starting kernel ..."
+}
+set timeout 1900
+expect {
+    timeout {send_user "timed out\n"; exit 1}
+    "Error parsing config file" {exit 4}
+#    "Uncompressing Linux" {exit 99}
+#    "Detecting network hardwar" {exit 0}
+    "Oops" {exit 2}
+    "panic occurred" {exit 6}
+    "Kernel panic" {sleep 60; exit 7}
+    "The debootstrap program exited with an error (return value 1)" {exit 3}
+    "Press enter to continue" {exit 5}
+# "Prompt: '?' for help>" as well as "Prompt: '?' for help, default=1>"
+    "Prompt: '?' for help" {exit 8}
+    "Restarting system." {exit 0}
+}
 
=== modified file 'armadaxp.expect'
--- armadaxp.expect	2012-07-04 14:00:28 +0000
+++ armadaxp.expect	2014-02-07 20:43:02 +0000
@@ -29,7 +29,7 @@
     timeout {send_user "timed out\n"; exit 1}
     -ex "Starting kernel ..."
 }
-set timeout 1900
+set timeout 3200
 expect {
     timeout {send_user "timed out\n"; exit 1}
     "Error parsing config file" {exit 4}
 
=== modified file 'console-ro'
--- console-ro	2012-03-21 11:59:24 +0000
+++ console-ro	2014-02-07 20:43:02 +0000
@@ -16,7 +16,11 @@
     hostname = sys.argv[1]
     console = local_setup['machines'][hostname]['console']
     if console['driver'] == 'conserver':
-        subprocess.check_call('while true;do sleep 999999;done|console -p3109 -Mlocalhost -s "%s"|(sed -n 2q;cat)' % hostname, shell=True)
+        if 'master' in console:
+            master = console['master']
+        else:
+            master = 'localhost'
+        subprocess.check_call('while true;do sleep 999999;done|console -p3109 -M "%s" -s "%s"|(sed -n 2q;cat)' % (master,hostname), shell=True)
     elif console['driver'] == 'tty':
         baud = console['baud']
         tty = console['tty']
 
=== modified file 'console-rw'
--- console-rw	2012-03-27 11:24:34 +0000
+++ console-rw	2014-02-07 20:43:02 +0000
@@ -10,6 +10,10 @@
     hostname = sys.argv[1]
     console = local_setup['machines'][hostname]['console']
     if console['driver'] == 'conserver':
-        subprocess.check_call('console -f -p3109 -Mlocalhost "%s"' % hostname, shell=True)
+        if 'master' in console:
+            master = console['master']
+        else:
+            master = 'localhost'
+        subprocess.check_call('console -f -p3109 -M "%s" "%s"' % (master,hostname), shell=True)
     else:
         raise NotImplementedError()
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-08 16:55:18 +0000
+++ debian/changelog	2014-02-07 20:43:02 +0000
@@ -1,3 +1,25 @@
+pandakit (0.1-4) precise; urgency=low
+
+  * Fixed a bug with the SSH global defines in toecap
+
+ -- Craig Magina <[e-mail]>  Sun, 15 Dec 2013 17:03:00 -0500
+
+pandakit (0.1-3) precise; urgency=low
+
+  * Minor cleanup from merge that broke installs
+  * Added new files in debian/install
+  * Added new recommends on conserver
+
+ -- Craig Magina <[e-mail]> Tue, 10 Dec 2013 14:43:24 -0400
+
+pandakit (0.1-2) precise; urgency=low
+
+  * Added configuration fields to specify raw power on and off commands for
+    ipmi
+  * Merged local changes
+
+ -- Craig Magina <[e-mail]>  Fri, 01 Nov 2013 18:06:44 -0400
+
 pandakit (0.1-1) precise; urgency=low
 
   * Initial release.
 
=== modified file 'debian/control'
--- debian/control	2012-05-18 14:24:21 +0000
+++ debian/control	2014-02-07 20:43:02 +0000
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Robie Basak <[e-mail]>
 Standards-Version: 3.9.3.1
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.7), python-support
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.7), python-support, python-setuptools
 XS-Python-Version: >= 2.7
 
 Package: pandakit
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, expect, cobbler, python-usb, snmp, socat, python-lockfile
-Recommends: u-boot-linaro-omap4-panda-splusb, ipmitool
+Recommends: u-boot-linaro-omap4-panda-splusb, ipmitool, conserver-server, conserver-client
 XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
-Description: tools to automate Pandaboard development
+Description: tools to automate ARM board development
 
=== modified file 'debian/install'
--- debian/install	2012-07-04 14:00:28 +0000
+++ debian/install	2014-02-07 20:43:02 +0000
@@ -2,12 +2,16 @@
 console-ro usr/lib/pandakit
 console-rw usr/lib/pandakit
 cobbler-clean usr/lib/pandakit
-generic.expect usr/lib/pandakit
-armadaxp.expect usr/lib/pandakit
+generic-install.expect usr/lib/pandakit
+generic-boot.expect usr/lib/pandakit
+armadaxp-install.expect usr/lib/pandakit
 omap4-netboot-mkcard.sh usr/lib/pandakit
 preseed.arm usr/share/pandakit
 preseed.armadaxp usr/share/pandakit
+preseed.armadaxp_z1 usr/share/pandakit
 preseed.i386 usr/share/pandakit
+preseed.amd64 usr/share/pandakit
+preseed.remote usr/share/pandakit
 relay-kmtronic usr/lib/pandakit
 remote-netboot.py usr/lib/pandakit
 ttyusb-dev usr/lib/pandakit
@@ -15,3 +19,4 @@
 local_setup.yaml etc/pandakit
 defaults.yaml etc/pandakit
 85-pandakit.rules /lib/udev/rules.d
+pandakit.rtupdate usr/share/python/runtime.d
 \ No newline at end of file
 
=== modified file 'defaults.yaml'
--- defaults.yaml	2012-07-04 15:10:26 +0000
+++ defaults.yaml	2014-02-07 20:43:02 +0000
@@ -1,20 +1,28 @@
-default_keywords: [ generic, armhf, quantal ]
+default_keywords: [ generic, armhf, raring ]
 settings:
     preseed: '/usr/share/pandakit/%(preseed)s'
     kernel: '%(mirror)s/dists/%(release)s/main/installer-%(arch)s/current/images/%(installer)s/%(kernel_name)s'
     initrd: '%(mirror)s/dists/%(release)s/main/installer-%(arch)s/current/images/%(installer)s/%(initrd_name)s'
     kopts: '%(kopts)s DEBIAN_FRONTEND=text'
-    monitor: '/usr/lib/pandakit/%(monitor)s.expect'
+    boot_monitor: '/usr/lib/pandakit/%(boot_monitor)s.expect'
+    install_monitor: '/usr/lib/pandakit/%(install_monitor)s.expect'
 settings_exceptions:
     # These are regular expression pairs
     # Workaround for precise netboot images being in a slightly different path
     # on armadaxp
+#    kernel:
+#        - - '/dists/precise/main/installer-armhf/current/images/armadaxp/netboot/uImage$'
+#          - '/dists/precise/main/installer-armhf/current/images/armadaxp/uImage'
+#    initrd:
+#        - - '/dists/precise/main/installer-armhf/current/images/armadaxp/netboot/uInitrd$'
+#          - '/dists/precise/main/installer-armhf/current/images/armadaxp/uInitrd'
+    # On highbank in precise, the installer is only available in the -updates pocket
     kernel:
-        - - '/dists/precise/main/installer-armhf/current/images/armadaxp/netboot/uImage$'
-          - '/dists/precise/main/installer-armhf/current/images/armadaxp/uImage'
+        - - '/dists/precise/main/installer-armhf/current/images/highbank/netboot/vmlinuz$'
+          - '/dists/precise-updates/main/installer-armhf/current/images/highbank/netboot/vmlinuz'
     initrd:
-        - - '/dists/precise/main/installer-armhf/current/images/armadaxp/netboot/uInitrd$'
-          - '/dists/precise/main/installer-armhf/current/images/armadaxp/uInitrd'
+        - - '/dists/precise/main/installer-armhf/current/images/highbank/netboot/initrd.gz$'
+          - '/dists/precise-updates/main/installer-armhf/current/images/highbank/netboot/initrd.gz'
 keyword_map:
     armel:
         mirror: http://ports.ubuntu.com/ubuntu-ports
@@ -28,34 +36,69 @@
         kernel_name: uImage
         initrd_name: uInitrd
         preseed: preseed.arm
-    i386:
+    amd64:
         mirror: http://archive.ubuntu.com/ubuntu
-        arch: i386
-        installer: netboot/ubuntu-installer/i386
+        arch: amd64
+        installer: netboot/ubuntu-installer/amd64
         kernel_name: linux
         initrd_name: initrd.gz
-        preseed: preseed.i386
+        preseed: preseed.amd64
+    lpae:
+        installer: generic-lpae/netboot
     oneiric:
         release: oneiric
     precise:
         release: precise
+    precise-updates:
+        release: precise-updates
     quantal:
         release: quantal
+    quantal-updates:
+        release: quantal-updates
+    raring:
+        release: raring
+    raring-updates:
+        release: raring-updates
+    saucy:
+        release: saucy
+    saucy-updates:
+        release: saucy-updates
+    trusty:
+        release: trusty
+    trusty-updates:
+        release: trusty-updates
     generic:
-        monitor: generic
+        boot_monitor: generic-boot
+        install_monitor: generic-install
         kopts: ''
     omap4:
         installer: omap4/netboot
-        kopts: 'console=ttyO2,115200n8 earlyprintk=ttyO2 text fixrtc'
+        kopts: 'console=ttyO2,115200n8 earlyprintk=ttyO2 text fixrtc vram=48M omapfb.vram=0:24M'
+    omap4-proposed:
+        installer: omap4/netboot
+        kopts: 'apt-setup/proposed=true console=ttyO2,115200n8 earlyprintk=ttyO2 text fixrtc'
     armadaxp:
         installer: armadaxp/netboot
-        preseed: preseed.armadaxp
-        monitor: armadaxp
-        kopts: 'console=ttyS0,115200n8 earlyprintk=ttyS0 text netcfg/choose_interface=auto fixrtc'
-    armadaxp_z1:
-        preseed: preseed.armadaxp_z1
+        install_monitor: armadaxp-install
+        kopts: 'console=ttyS0,115200n8 earlyprintk=ttyS0 text netcfg/choose_interface=auto fixrtc'
+    armadaxp-proposed:
+        installer: armadaxp/netboot
+        install_monitor: armadaxp-install
+        kopts: 'apt-setup/proposed=true console=ttyS0,115200n8 earlyprintk=ttyS0 text netcfg/choose_interface=auto fixrtc'
+    armadaxp-z1:
+        preseed: preseed.armadaxp-z1
+        # Need to specify a local hand-built installer somehow for Z1
+        installer: armadaxp-z1/netboot
+        install_monitor: armadaxp-install
+        kopts: 'console=ttyS0,115200n8 earlyprintk=ttyS0 text netcfg/choose_interface=auto fixrtc'
     highbank:
-        installer: highbank/netboot
-        kopts: 'console=ttyAMA0 earlyprintk=ttyAMA0 text netcfg/choose_interface=auto'
+        release: quantal
+        installer: highbank/netboot
+        kopts: 'console=ttyAMA0 earlyprintk=ttyAMA0 text netcfg/choose_interface=auto fixrtc'
+        kernel_name: vmlinuz
+        initrd_name: initrd.gz
+    highbank-proposed:
+        installer: highbank/netboot
+        kopts: 'apt-setup/proposed=true console=ttyAMA0 earlyprintk=ttyAMA0 text netcfg/choose_interface=auto fixrtc'
         kernel_name: vmlinuz
         initrd_name: initrd.gz
 
=== added file 'generic-boot.expect'
--- generic-boot.expect	1970-01-01 00:00:00 +0000
+++ generic-boot.expect	2014-02-07 20:43:02 +0000
@@ -0,0 +1,16 @@
+#!/usr/bin/expect -f
+
+set timeout 1600
+spawn pk console $argv
+expect {
+    timeout {send_user "timed out\n"; exit 1}
+#    "Uncompressing Linux" {exit 99}
+#    "Detecting network hardwar" {exit 0}
+    "Oops" {exit 2}
+    "panic occurred" {exit 6}
+    "Kernel panic" {sleep 60; exit 7}
+    "Press enter to continue" {exit 5}
+#    "Prompt: '?' for help>" as well as "Prompt: '?' for help, default=1>"
+    "Prompt: '?' for help" {exit 8}
+    "login:" {exit 0}
+}
 
=== added file 'generic-install.expect'
--- generic-install.expect	1970-01-01 00:00:00 +0000
+++ generic-install.expect	2014-02-07 20:43:02 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/expect -f
+
+set timeout 1900
+spawn pk console $argv
+expect {
+    "ERROR: Debootstrap warning" {exit 75}
+    "You have not selected any partitions for use as swap space." {exit 75}
+    "Could not stat device" {exit 75}
+    "No root file system is defined." {exit 75}
+    "ERROR: Installation step failed" {exit 75}
+    timeout {send_user "timed out\n"; exit 1}
+    "Error parsing config file" {exit 4}
+#    "Uncompressing Linux" {exit 99}
+#    "Detecting network hardwar" {exit 0}
+    "Oops" {exit 2}
+    "panic occurred" {exit 6}
+    "Kernel panic" {sleep 60; exit 7}
+    "The debootstrap program exited with an error (return value 1)" {exit 3}
+    "Press enter to continue" {exit 5}
+#    "Prompt: '?' for help>" as well as "Prompt: '?' for help, default=1>"
+    "Prompt: '?' for help" {exit 8}
+    "Restarting system." {exit 0}
+}
 
=== modified file 'generic.expect'
--- generic.expect	2012-04-03 14:30:44 +0000
+++ generic.expect	2014-02-07 20:43:02 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 
-set timeout 1600
+set timeout 3200
 spawn pk console $argv
 expect {
     "ERROR: Debootstrap warning" {exit 75}
 
=== added file 'pandakit.rtupdate'
--- pandakit.rtupdate	1970-01-01 00:00:00 +0000
+++ pandakit.rtupdate	2014-02-07 20:43:02 +0000
@@ -0,0 +1,6 @@
+#! /bin/sh
+set -e
+if [ "$1" = rtupdate ]; then
+	pyclean -p pandakit /usr/lib/pandakit
+	pycompile -p pandakit -V 2.7- /usr/lib/pandakit
+fi
 \ No newline at end of file
 
=== modified file 'pandakit/ipmi.py'
--- pandakit/ipmi.py	2012-05-19 00:14:47 +0000
+++ pandakit/ipmi.py	2014-02-07 20:43:02 +0000
@@ -13,6 +13,29 @@
     bmc = machine['bmc']
     return bmc['ip_address']
 
+def get_bmc_user(machine_name):
+    machines = config.get_config()['machines']
+    machine = machines[machine_name]
+    bmc = machine['bmc']
+    return bmc['username']
+
+def get_bmc_pwd(machine_name):
+    machines = config.get_config()['machines']
+    machine = machines[machine_name]
+    bmc = machine['bmc']
+    return bmc['password']
+
+def get_bmc_intf(machine_name):
+    machines = config.get_config()['machines']
+    machine = machines[machine_name]
+    bmc = machine['bmc']
+    try:
+        return bmc['intf']
+    except KeyError:
+        return 'lan'
+    else:
+        return bmc['intf']
+
 def has_bmc(machine_name):
     try:
         get_bmc_ip(machine_name)
@@ -23,11 +46,16 @@
 
 def sol(machine_name):
     bmc_ip = get_bmc_ip(machine_name)
-    os.execlp('socat', 'socat', '-,echo=0,raw', 'EXEC:ipmitool -H %s -U admin -P admin -I lanplus sol activate,pty' % bmc_ip)
+    bmc_user = get_bmc_user(machine_name)
+    bmc_pwd = get_bmc_pwd(machine_name)
+    os.execlp('socat', 'socat', '-,echo=0,raw', 'EXEC:ipmitool -H %s -U %s -P %s -I lanplus sol activate,pty' % (bmc_ip,  bmc_user, bmc_pwd) )
 
 def ipmi(machine_name, *args):
     bmc_ip = get_bmc_ip(machine_name)
-    cmd = ['ipmitool', '-H', bmc_ip, '-U', 'admin', '-P', 'admin']
+    bmc_user = get_bmc_user(machine_name)
+    bmc_pwd = get_bmc_pwd(machine_name)
+    bmc_intf = get_bmc_intf(machine_name)
+    cmd = ['ipmitool', '-H', bmc_ip, '-U', bmc_user, '-P', bmc_pwd, '-I', bmc_intf]
     cmd.extend(args)
     subprocess.check_call(cmd, close_fds=True)
     time.sleep(3)
 
=== modified file 'pandakit/pk.py'
--- pandakit/pk.py	2013-09-23 13:54:30 +0000
+++ pandakit/pk.py	2014-02-07 20:43:02 +0000
@@ -18,9 +18,9 @@
     for hostname in hostnames:
         machine_definition = local_config['machines'][hostname]
         if 'bmc' in machine_definition:
-            if 'raw' in machine_definition:
-                pandakit.ipmi.main(hostname, machine_definition['bmc']['raw'][state])
-            else:
+            try:
+                pandakit.ipmi.main(hostname, *machine_definition['bmc'][state + '-cmd'].split())
+            except KeyError:
                 pandakit.ipmi.main(hostname, 'power', state)
         elif 'relay' in machine_definition:
             relay_name = machine_definition['relay']['name']
@@ -41,6 +41,11 @@
                 relay_index = local_config['machines'][hostname]['relay']['index']
                 state_code = { 'on': 1, 'off': 2, 'reset': 3 }[state]
                 subprocess.check_call('snmpset -c private -v1 %s .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.%d i %d >/dev/null' % (host, relay_index, state_code), shell=True)
+            elif relay['driver'] == 'sentrysnmp':
+                host = relay['host']
+                relay_index = local_config['machines'][hostname]['relay']['index']
+                state_code = { 'on': 1, 'off': 2, 'reset': 3 }[state]
+                subprocess.check_call('snmpset -c private -v1 %s .1.3.6.1.4.1.1718.3.2.3.1.11.1.1.%d i %d >/dev/null' % (host, relay_index, state_code), shell=True)
             else:
                 print "Power cycle %s and press enter" % hostname
                 raw_input()
 
=== modified file 'pandakit/toecap.py'
--- pandakit/toecap.py	2012-07-04 15:10:26 +0000
+++ pandakit/toecap.py	2014-02-07 20:43:02 +0000
@@ -32,8 +32,6 @@
 except:
     HOME = os.getenv('HOME')
 
-SSH_KNOWN_HOSTS_FILE = os.path.join(HOME, '.ssh', 'known_hosts')
-SSH_ID_RSA_PUB_FILE = os.path.join(HOME, '.ssh', 'id_rsa.pub')
 USBBOOT_DEVPATH_DIR = '/var/run/pandakit/usbboot'
 COBBLER_LOCK = '/var/run/pandakit/cobbler'
 COBBLER_LOCK_DIR = os.path.dirname(COBBLER_LOCK)
@@ -167,7 +165,7 @@
     return 'console' in config.get_config()['machines'][hostname]
 
 
-def do_boot(args):
+def do_install(args):
     if args.ip_address:
         sudo_user = os.getenv('SUDO_USER')
         if sudo_user:
@@ -183,10 +181,10 @@
     if ipmi.has_bmc(args.hostname):
         ipmi.main(args.hostname, 'chassis', 'bootdev', 'pxe')
 
-    if args.monitor and has_console(args.hostname):
+    if args.install_monitor and has_console(args.hostname):
         # Start the monitor before resetting the board, so that it doesn't
         # miss anything from the moment the board powers on.
-        monitor = subprocess.Popen([args.monitor, args.hostname])
+        monitor = subprocess.Popen([args.install_monitor, args.hostname])
         subprocess.check_call(['pk', 'power', 'on', args.hostname])
         exit_status = monitor.wait()
         return exit_status
@@ -196,6 +194,12 @@
         raw_input()
         return 0
 
+def boot_monitor(args):
+    if args.boot_monitor and has_console(args.hostname):
+        monitor = subprocess.Popen([args.boot_monitor, args.hostname])
+        exit_status = monitor.wait()
+        return exit_status
+ 
 
 def assign_defaults(args):
     local_setup = config.get_config()
@@ -211,7 +215,8 @@
     keywords_to_apply = itertools.chain(default['default_keywords'],
                                         machine_keywords,
                                         args.keywords)
-    settings_to_apply = ['kernel', 'initrd', 'preseed', 'kopts', 'monitor']
+    settings_to_apply = ['kernel', 'initrd', 'preseed', 'kopts',
+                         'boot_monitor', 'install_monitor']
 
     for keyword in keywords_to_apply:
         keyword_assignments.update(default['keyword_map'][keyword])
@@ -248,6 +253,7 @@
                 pass
 
     if 'ssh_key' not in os.environ:
+        SSH_ID_RSA_PUB_FILE = os.path.join(HOME, '.ssh', 'id_rsa.pub')
         try:
             f = open(SSH_ID_RSA_PUB_FILE, 'r')
         except IOError, e:
@@ -266,7 +272,8 @@
     parser.add_argument('--initrd')
     parser.add_argument('--preseed')
     parser.add_argument('--kopts')
-    parser.add_argument('--monitor')
+    parser.add_argument('--boot-monitor')
+    parser.add_argument('--install-monitor')
     parser.add_argument('--ip-address')
     parser.add_argument('--usb-spl')
     parser.add_argument('--tries', type=int, default=1)
@@ -319,7 +326,7 @@
             print "Removing temporary cobbler config"
             cobbler_teardown(*context)
         teardown_functions.append(teardown_cobbler)
-            
+
         if args.usb_spl:
             mkdir_p(USBBOOT_DEVPATH_DIR)
             usbboot_devpath = os.path.join(USBBOOT_DEVPATH_DIR, args.usb_spl)
@@ -328,7 +335,7 @@
                 os.unlink(usbboot_devpath)
             teardown_functions.append(teardown_usb_spl)
 
-        exit_status = do_boot(args)
+        exit_status = do_install(args)
 
     finally:
         for f in teardown_functions:
@@ -336,16 +343,27 @@
 
     # Exit if the monitor reported a problem
     if exit_status:
-        print >>sys.stderr, 'Monitor returned status %d' % exit_status
+        print >>sys.stderr, 'Install Monitor returned status %d' % exit_status
+        return exit_status
+
+    exit_status = boot_monitor(args)
+    # Exit if the monitor reported a problem
+    if exit_status:
+        print >>sys.stderr, 'Boot Monitor returned status %d' % exit_status
         return exit_status
 
     if args.ip_address:
+        SSH_KNOWN_HOSTS_FILE = os.path.join(HOME, '.ssh', 'known_hosts')
         keyscan = subprocess.Popen(['ssh-keyscan', args.ip_address],
                                    stdout=subprocess.PIPE)
         keyscan_output = keyscan.communicate()[0]
         if keyscan.returncode:
             sys.exit(keyscan.returncode)
-        with open(SSH_KNOWN_HOSTS_FILE, 'a') as f:
+        if os.path.exists(SSH_KNOWN_HOSTS_FILE):
+            fmode = 'a'
+        else:
+            fmode = 'w'
+        with open(SSH_KNOWN_HOSTS_FILE, fmode) as f:
             f.write(keyscan_output)
 
     return 0
 
=== added file 'preseed.amd64'
--- preseed.amd64	1970-01-01 00:00:00 +0000
+++ preseed.amd64	2014-02-07 20:43:02 +0000
@@ -0,0 +1,69 @@
+d-i anna/choose_modules string network-console parted-udeb
+d-i network-console/password password ubuntu
+d-i network-console/password-again password ubuntu
+d-i network-console/start note
+d-i clock-setup/ntp boolean true
+d-i clock-setup/ntp-server string ntp.ubuntu.com
+d-i clock-setup/utc-auto boolean true
+d-i console-setup/ask_detect boolean false
+d-i debian-installer/exit/restart boolean true
+d-i finish-install/reboot_in_progress note
+d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/update-policy select none
+d-i pkgsel/updatedb boolean false
+d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string unassigned-domain
+d-i partman-auto/disk string /dev/sda
+d-i partman-auto/method string regular
+d-i partman-auto/purge_lvm_from_device boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-md/device_remove_md boolean true
+d-i partman-auto/expert_recipe string                       \
+    boot-root ::                                            \
+        256 256 256 ext3                                    \
+            $primary{{ }} $bootable{{ }}                    \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext3 }}        \
+            mountpoint{{ /boot }}                           \
+        .                                                   \
+        100000 100000 100000 ext4                           \
+            $primary{{ }}                                   \
+	    method{{ format }} format{{ }}                  \
+	    use_filesystem{{ }} filesystem{{ ext4 }}        \
+	    mountpoint{{ / }}                               \
+        .                                                   \
+        1100 1100 1100 linux-swap                           \
+	    method{{ swap }} format{{ }}                    \
+        .                                                   \
+        20000 20000 20000 ext4                              \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext4 }}        \
+            label{{ TEST }}                                 \
+            mountpoint{{ /test }}                           \
+        .						    \
+        100 100 100 ext4                                    \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext4 }}        \
+            label{{ DELETEME }}                             \
+            mountpoint{{ /tmp/deleteme }}                   \
+        .
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/mount_style select traditional
+d-i passwd/user-fullname string Ubuntu
+d-i passwd/user-password-crypted password $6$.1eHH0iY$ArGzKX2YeQ3G6U.mlOO3A.NaL22Ewgz8Fi4qqz.Ns7EMKjEJRIW2Pm/TikDptZpuu7I92frytmk5YeL.9fRY4.
+d-i passwd/username string ubuntu
+d-i user-setup/allow-password-weak boolean true
+d-i base-installer/kernel/override-image string linux-server 
+d-i debian-installer/splash boolean false
+d-i pkgsel/install-language-support boolean false
+d-i pkgsel/language-pack-patterns string
+d-i pkgsel/include string openssh-server
+d-i mirror/country string manual
+d-i mirror/http/hostname string archive.ubuntu.com
+d-i mirror/http/directory string /ubuntu
+d-i mirror/http/proxy string {http_proxy}
+d-i debian-installer/locale string C
+d-i preseed/late_command string echo "ubuntu ALL=(ALL) NOPASSWD: ALL" > /target/etc/sudoers.d/pandakit; chmod 0440 /target/etc/sudoers.d/pandakit; mkdir -m700 -p /target/root/.ssh; echo {ssh_key} > /target/root/.ssh/authorized_keys; echo http_proxy={http_proxy} >> /target/etc/environment; mkdir -m700 -p /target/home/ubuntu/.ssh; cp /target/root/.ssh/authorized_keys /target/home/ubuntu/.ssh/; in-target chown -R ubuntu. /home/ubuntu/.ssh; umount -f `mount | grep deleteme | cut -f 1 -d " "`; parted /dev/sda rm `grep deleteme /target/etc/fstab | cut -f 1 -d " " | cut -f 2 -d "a"`; sed -i "/deleteme/d" /target/etc/fstab
 
=== modified file 'preseed.arm'
--- preseed.arm	2012-07-04 14:00:28 +0000
+++ preseed.arm	2014-02-07 20:43:02 +0000
@@ -1,3 +1,7 @@
+d-i anna/choose_modules string network-console parted-udeb
+d-i network-console/password password ubuntu
+d-i network-console/password-again password ubuntu
+d-i network-console/start note
 d-i clock-setup/ntp boolean true
 d-i clock-setup/ntp-server string ntp.ubuntu.com
 d-i clock-setup/utc-auto boolean true
@@ -16,26 +20,32 @@
 d-i partman-md/device_remove_md boolean true
 d-i partman-auto/expert_recipe string                       \
     boot-root ::                                            \
-        256 256 256 ext4                                    \
+        256 256 256 ext3                                    \
             $primary{{ }} $bootable{{ }}                    \
             method{{ format }} format{{ }}                  \
-            use_filesystem{{ }} filesystem{{ ext4 }}        \
+            use_filesystem{{ }} filesystem{{ ext3 }}        \
             mountpoint{{ /boot }}                           \
         .                                                   \
-        4000 10000 20000 ext4                               \
+        100000 100000 100000 ext4                           \
             $primary{{ }}                                   \
-	    method{{ format }} format{{ }}                  \
-	    use_filesystem{{ }} filesystem{{ ext4 }}        \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext4 }}        \
 	    mountpoint{{ / }}                               \
         .                                                   \
-	 1100 1100 1100 linux-swap                          \
-	    method{{ swap }} format{{ }}                    \
+        1100 1100 1100 linux-swap                           \
+            method{{ swap }} format{{ }}                    \
         .                                                   \
-        500 10000 1000000 ext4                              \
+        20000 20000 20000 ext4                              \
             method{{ format }} format{{ }}                  \
             use_filesystem{{ }} filesystem{{ ext4 }}        \
             label{{ TEST }}                                 \
             mountpoint{{ /test }}                           \
+        .                                                   \
+        100 100 100 ext4                                    \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext4 }}        \
+            label{{ DELETEME }}                             \
+            mountpoint{{ /tmp/deleteme }}                   \
         .
 d-i partman-partitioning/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
@@ -56,4 +66,4 @@
 d-i mirror/http/directory string /ubuntu-ports
 d-i mirror/http/proxy string {http_proxy}
 d-i debian-installer/locale string C
-d-i preseed/late_command string echo "ubuntu ALL=(ALL) NOPASSWD: ALL" > /target/etc/sudoers.d/pandakit; chmod 0440 /target/etc/sudoers.d/pandakit; mkdir -m700 -p /target/root/.ssh; echo {ssh_key} > /target/root/.ssh/authorized_keys; echo http_proxy={http_proxy} >> /target/etc/environment; mkdir -m700 -p /target/home/ubuntu/.ssh; cp /target/root/.ssh/authorized_keys /target/home/ubuntu/.ssh/; in-target chown -R ubuntu. /home/ubuntu/.ssh
+d-i preseed/late_command string echo "ubuntu ALL=(ALL) NOPASSWD: ALL" > /target/etc/sudoers.d/pandakit; chmod 0440 /target/etc/sudoers.d/pandakit; mkdir -m700 -p /target/root/.ssh; echo {ssh_key} > /target/root/.ssh/authorized_keys; echo http_proxy={http_proxy} >> /target/etc/environment; mkdir -m700 -p /target/home/ubuntu/.ssh; cp /target/root/.ssh/authorized_keys /target/home/ubuntu/.ssh/; in-target chown -R ubuntu. /home/ubuntu/.ssh; umount -f `mount | grep deleteme | cut -f 1 -d " "`; parted /dev/sda rm `grep deleteme /target/etc/fstab | cut -f 1 -d " " | cut -f 2 -d "a"`; sed -i "/deleteme/d" /target/etc/fstab
 
=== added file 'preseed.ml'
--- preseed.ml	1970-01-01 00:00:00 +0000
+++ preseed.ml	2014-02-07 20:43:02 +0000
@@ -0,0 +1,65 @@
+d-i anna/choose_modules string network-console parted-udeb
+d-i network-console/password password ubuntu
+d-i network-console/password-again password ubuntu
+d-i network-console/start note
+d-i clock-setup/ntp boolean true
+d-i clock-setup/ntp-server string ntp.ubuntu.com
+d-i clock-setup/utc-auto boolean true
+d-i console-setup/ask_detect boolean false
+d-i debian-installer/exit/restart boolean true
+d-i finish-install/reboot_in_progress note
+d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/update-policy select none
+d-i pkgsel/updatedb boolean false
+d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string unassigned-domain
+d-i partman-auto/disk string /dev/sda
+d-i partman-auto/method string regular
+d-i partman-auto/purge_lvm_from_device boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-md/device_remove_md boolean true
+d-i partman-auto/expert_recipe string                       \
+    boot-root ::                                            \
+        256 256 256 ext3                                    \
+            $primary{{ }} $bootable{{ }}                    \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext3 }}        \
+            mountpoint{{ /boot }}                           \
+        .                                                   \
+        100000 100000 100000 ext4                           \
+            $primary{{ }}                                   \
+	    method{{ format }} format{{ }}                  \
+	    use_filesystem{{ }} filesystem{{ ext4 }}        \
+	    mountpoint{{ / }}                               \
+        .                                                   \
+        1100 1100 1100 linux-swap                           \
+	    method{{ swap }} format{{ }}                    \
+        .                                                   \
+        20000 20000 20000 ext4                              \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext4 }}        \
+            label{{ TEST }}                                 \
+            mountpoint{{ /test }}                           \
+        .						    \
+        100 100 100 ext4                                    \
+            method{{ format }} format{{ }}                  \
+            use_filesystem{{ }} filesystem{{ ext4 }}        \
+            label{{ DELETEME }}                             \
+            mountpoint{{ /tmp/deleteme }}                   \
+        .
+d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/mount_style select traditional
+d-i passwd/user-fullname string Ubuntu
+d-i passwd/user-password-crypted password $6$.1eHH0iY$ArGzKX2YeQ3G6U.mlOO3A.NaL22Ewgz8Fi4qqz.Ns7EMKjEJRIW2Pm/TikDptZpuu7I92frytmk5YeL.9fRY4.
+d-i passwd/username string ubuntu
+d-i user-setup/allow-password-weak boolean true
+d-i base-installer/kernel/override-image string linux-server 
+d-i debian-installer/splash boolean false
+d-i pkgsel/install-language-support boolean false
+d-i pkgsel/language-pack-patterns string
+d-i pkgsel/include string openssh-server
+d-i debian-installer/locale string C
+d-i preseed/late_command string echo "ubuntu ALL=(ALL) NOPASSWD: ALL" > /target/etc/sudoers.d/pandakit; chmod 0440 /target/etc/sudoers.d/pandakit; mkdir -m700 -p /target/root/.ssh; echo {ssh_key} > /target/root/.ssh/authorized_keys; echo http_proxy={http_proxy} >> /target/etc/environment; mkdir -m700 -p /target/home/ubuntu/.ssh; cp /target/root/.ssh/authorized_keys /target/home/ubuntu/.ssh/; in-target chown -R ubuntu. /home/ubuntu/.ssh; umount -f `mount | grep deleteme | cut -f 1 -d " "`; parted /dev/sda rm `grep deleteme /target/etc/fstab | cut -f 1 -d " " | cut -f 2 -d "a"`; sed -i "/deleteme/d" /target/etc/fstab
 
=== added file 'preseed.remote'
--- preseed.remote	1970-01-01 00:00:00 +0000
+++ preseed.remote	2014-02-07 20:43:02 +0000
@@ -0,0 +1,28 @@
+d-i clock-setup/ntp 				boolean true
+d-i clock-setup/ntp-server 			string ntp.ubuntu.com
+d-i clock-setup/utc-auto 			boolean true
+d-i console-setup/ask_detect 			boolean false
+d-i pkgsel/upgrade 				select full-upgrade
+d-i pkgsel/update-policy 			select none
+d-i pkgsel/updatedb 				boolean false
+d-i netcfg/get_hostname 			string unassigned-hostname
+d-i netcfg/get_domain 				string unassigned-domain
+d-i anna/choose_modules 			string network-console
+d-i network-console/password 			password uinst
+d-i network-console/password-again 		password uinst
+d-i passwd/user-fullname 			string Ubuntu
+d-i passwd/user-password-crypted 		password $6$.1eHH0iY$ArGzKX2YeQ3G6U.mlOO3A.NaL22Ewgz8Fi4qqz.Ns7EMKjEJRIW2Pm/TikDptZpuu7I92frytmk5YeL.9fRY4.
+d-i passwd/username 				string ubuntu
+d-i user-setup/allow-password-weak 		boolean true
+d-i base-installer/kernel/override-image 	string linux-server 
+d-i debian-installer/splash 			boolean false
+d-i pkgsel/install-language-support 		boolean false
+d-i pkgsel/language-pack-patterns 		string
+d-i pkgsel/include 				string openssh-server
+d-i mirror/country 				string manual
+d-i mirror/http/hostname 			string ports.ubuntu.com
+d-i mirror/http/directory 			string /ubuntu-ports
+d-i mirror/http/proxy 				string {http_proxy}
+d-i mirror/suite 				string precise
+d-i debian-installer/locale 			string C
+d-i preseed/late_command string echo "ubuntu ALL=(ALL) NOPASSWD: ALL" > /target/etc/sudoers.d/pandakit; chmod 0440 /target/etc/sudoers.d/pandakit; mkdir -m700 -p /target/root/.ssh; echo {ssh_key} > /target/root/.ssh/authorized_keys; echo http_proxy={http_proxy} >> /target/etc/environment; mkdir -m700 -p /target/home/ubuntu/.ssh; cp /target/root/.ssh/authorized_keys /target/home/ubuntu/.ssh/; in-target chown -R ubuntu. /home/ubuntu/.ssh