Merge lp:~pwlars/lava-dispatcher/fix-824622 into lp:lava-dispatcher

[Paul Larson]

Make flash-kernel in the test partition do nothing

=== modified file 'lava_dispatcher/actions/deploy.py'
--- lava_dispatcher/actions/deploy.py	2011-08-04 07:19:53 +0000
+++ lava_dispatcher/actions/deploy.py	2011-08-11 16:02:31 +0000
@@ -170,6 +170,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)