[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 86: Fix bug #821385 auto-mount prevent formating on testboot and testrootfs from Spring Zhang

Message ID 20110818151015.21765.27643.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Paul Larson Aug. 18, 2011, 3:10 p.m.
Merge authors:
  Spring Zhang (qzhang)
Related merge proposals:
  https://code.launchpad.net/~qzhang/lava-dispatcher/fix-bug-821385/+merge/72040
  proposed by: Spring Zhang (qzhang)
------------------------------------------------------------
revno: 86 [merge]
committer: Paul Larson <paul.larson@linaro.org>
branch nick: lava-dispatcher
timestamp: Thu 2011-08-18 15:08:04 +0100
message:
  Fix bug #821385 auto-mount prevent formating on testboot and testrootfs from Spring Zhang
modified:
  lava_dispatcher/actions/deploy.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription

Patch

=== modified file 'lava_dispatcher/actions/deploy.py'
--- lava_dispatcher/actions/deploy.py	2011-08-18 14:05:24 +0000
+++ lava_dispatcher/actions/deploy.py	2011-08-18 14:08:04 +0000
@@ -153,6 +153,9 @@ 
         client = self.client
         print "Deploying linaro image"
         client.run_shell_command(
+            'umount /dev/disk/by-label/testrootfs',
+            response = MASTER_STR)
+        client.run_shell_command(
             'mkfs.ext3 -q /dev/disk/by-label/testrootfs -L testrootfs',
             response = MASTER_STR)
         client.run_shell_command(
@@ -177,6 +180,9 @@ 
     def deploy_linaro_bootfs(self, bootfs):
         client = self.client
         client.run_shell_command(
+            'umount /dev/disk/by-label/testboot',
+            response = MASTER_STR)
+        client.run_shell_command(
             'mkfs.vfat /dev/disk/by-label/testboot -n testboot',
             response = MASTER_STR)
         client.run_shell_command(