From patchwork Thu Aug 18 15:10:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 3510 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0182C23F26 for ; Thu, 18 Aug 2011 15:10:21 +0000 (UTC) Received: from mail-ew0-f52.google.com (mail-ew0-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id EC565A1809D for ; Thu, 18 Aug 2011 15:10:20 +0000 (UTC) Received: by mail-ew0-f52.google.com with SMTP id 28so1105372ewy.11 for ; Thu, 18 Aug 2011 08:10:20 -0700 (PDT) Received: by 10.213.29.147 with SMTP id q19mr1788794ebc.132.1313680218890; Thu, 18 Aug 2011 08:10:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.213.102.5 with SMTP id e5cs78561ebo; Thu, 18 Aug 2011 08:10:17 -0700 (PDT) Received: by 10.213.22.201 with SMTP id o9mr1731505ebb.42.1313680216033; Thu, 18 Aug 2011 08:10:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com [91.189.90.7]) by mx.google.com with ESMTPS id g54si5904753wee.72.2011.08.18.08.10.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Aug 2011 08:10:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Qu4EZ-0005AJ-KR for ; Thu, 18 Aug 2011 15:10:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 90542E0304 for ; Thu, 18 Aug 2011 15:10:15 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 87 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 87: Merge fix for bug 824622 Message-Id: <20110818151015.21765.5237.launchpad@ackee.canonical.com> Date: Thu, 18 Aug 2011 15:10:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13697"; Instance="initZopeless config overlay" X-Launchpad-Hash: a3bdf2cb41a72739fb8110d2af34cb0648b36e2b 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 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 === 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)