Merge lp:~doanac/utah/dev+trunk into lp:utah

[Andy Doan]

this gets our latest fixes from trunk into dev so that we can make this our new permanent dev focus.

[Max Brustkern (nuclearbob)]

Seems reasonable to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-27 12:01:13 +0000
+++ debian/changelog	2013-03-28 19:48:23 +0000
@@ -4,7 +4,19 @@
 
  -- Javier Collado <[e-mail]>  Wed, 27 Mar 2013 13:00:47 +0100
 
-utah (0.9ubuntu2) quantal; urgency=low
+utah (0.9.2ubuntu1) precise; urgency=low
+
+  * Moving removenfs to avoid a race condition on some machines
+
+ -- Max Brustkern <[e-mail]>  Wed, 27 Mar 2013 11:33:20 -0400
+
+utah (0.9.1ubuntu1) UNRELEASED; urgency=low
+  [ Andy Doan ]
+  * remove desktop check of wait_for_booted (LP: #1160148)
+
+ -- Andy Doan <[e-mail]>  Tue, 26 Mar 2013 13:38:24 -0500
+
+utah (0.9ubuntu2) UNRELEASED; urgency=low
 
   [ Javier Collado ]
   * Added battery_measurements boolean variable to runlist (defaults to False)

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2013-03-21 14:50:49 +0000
+++ utah/provisioning/baremetal/cobbler.py	2013-03-28 19:48:23 +0000
@@ -196,14 +196,17 @@
         self.rsyslog.wait_for_install(config.install_steps,
                                       self._disable_netboot)
 
-        if self.installtype == 'desktop':
-            # TODO: look into getting this working for d-i installs
-            self.rsyslog.wait_for_booted(config.boot_steps)
-            self._removenfs()
+        # TODO: wait_for_booted isn't working on d-i installs and
+        # autopilot jobs like:
+        # http://10.97.0.1:8080/view/autopilot/job/ps-unity-autopilot-release-testing/140/label=autopilot-nvidia/
+        # self.rsyslog.wait_for_booted(config.boot_steps)
 
         retry(self.sshcheck, logmethod=self.logger.info,
               retry_timeout=config.checktimeout)
 
+        if self.installtype == 'desktop':
+            self._removenfs()
+
         self.provisioned = True
         self.active = True
         self._uuid_check()