[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 87: Merge fix for bug 824622

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

Commit Message

Paul Larson Aug. 18, 2011, 3:10 p.m.
Merge authors:
  Paul Larson (pwlars)
Related merge proposals:
  https://code.launchpad.net/~pwlars/lava-dispatcher/fix-824622/+merge/71228
  proposed by: Paul Larson (pwlars)
------------------------------------------------------------
revno: 87 [merge]
committer: Paul Larson <paul.larson@linaro.org>
branch nick: lava-dispatcher
timestamp: Thu 2011-08-18 15:50:41 +0100
message:
  Merge fix for bug 824622
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:08:04 +0000
+++ lava_dispatcher/actions/deploy.py	2011-08-18 14:50:41 +0000
@@ -173,6 +173,15 @@ 
         client.run_shell_command(
             'echo linaro > /mnt/root/etc/hostname',
             response = MASTER_STR)
+        #DO NOT REMOVE - diverting flash-kernel and linking it to /bin/true
+        #prevents a serious problem where packages getting installed that
+        #call flash-kernel can update the kernel on the master image
+        client.run_shell_command(
+            'chroot /mnt/root dpkg-divert --local /usr/sbin/flash-kernel',
+            response = MASTER_STR)
+        client.run_shell_command(
+            'chroot /mnt/root ln -sf /bin/true /usr/sbin/flash-kernel',
+            response = MASTER_STR)
         client.run_shell_command(
             'umount /mnt/root',
             response = MASTER_STR)