From patchwork Fri Mar 23 06:29:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 7431 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 367E123E29 for ; Fri, 23 Mar 2012 06:29:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id D1904A1849A for ; Fri, 23 Mar 2012 06:29:13 +0000 (UTC) Received: by iage36 with SMTP id e36so5605067iag.11 for ; Thu, 22 Mar 2012 23:29:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=4mAGghvQfUhJfrdVw5b3hWXePlbs7OYoxQx83MkNBuQ=; b=ORYEPD7tycANI2xl8wEcuV6OPUjU7hE3fGksUfaM1dGEsE8ntgPQlVs5W1fY7DhXmO RAItlC0M3BUrSQzU0Q2Leu92u5hDb8Q9pSMyg3A6ptSuHObfS9fw0RshTJVKjBrNTcEl tTk++TSl17dL1MqfPGRuJnAenx0uRGuTSpzxm49mEVDT141GDArGaSrCg4f7uurKIUlP JFi4ZuhuocukwzQNmYz7BTWb4MZlF4Z10go6xzMqIRoAEUJqYvLcRadsdYwtamGNLif3 qunJjhnThh3fXwpZXV4mhvs22pJYRes1NO//O9AK9l6WKccJi9r8616/FBgd3uK2C/3q 4ODw== Received: by 10.42.72.130 with SMTP id o2mr7656553icj.8.1332484153237; Thu, 22 Mar 2012 23:29:13 -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.231.203.79 with SMTP id fh15csp15456ibb; Thu, 22 Mar 2012 23:29:12 -0700 (PDT) Received: by 10.180.107.101 with SMTP id hb5mr3742231wib.7.1332484151746; Thu, 22 Mar 2012 23:29:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id y8si4838675wiy.13.2012.03.22.23.29.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 23:29:11 -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 1SAxzq-0005qp-JD for ; Fri, 23 Mar 2012 06:29:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 87A01E002A for ; Fri, 23 Mar 2012 06:29:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 502 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 502: Replace and then restore start-stop-daemon and initctl (LP: #98604): Message-Id: <20120323062910.18042.5920.launchpad@ackee.canonical.com> Date: Fri, 23 Mar 2012 06:29:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14996"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 3e04f2e338014dc128b6cde1cf8bb3a44419631b X-Gm-Message-State: ALoCoQlpWeEVsqqf+btK6getd9hVj4ujiD32m76HOdLIk7yW0Dd27UPd9oYep0jxKZkutfYV/ivC Merge authors: Fathi Boudra (fboudra) Related merge proposals: https://code.launchpad.net/~fboudra/linaro-image-tools/bug-912782-v2/+merge/98914 proposed by: Fathi Boudra (fboudra) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 502 [merge] committer: Fathi Boudra branch nick: linaro-image-tools timestamp: Fri 2012-03-23 08:27:06 +0200 message: Replace and then restore start-stop-daemon and initctl (LP: #98604): Upstart jobs and some init script don't honor policy-rc.d. modified: linaro-hwpack-install --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro-hwpack-install' --- linaro-hwpack-install 2012-03-21 10:32:24 +0000 +++ linaro-hwpack-install 2012-03-23 06:13:05 +0000 @@ -90,6 +90,10 @@ echo -n "Cleaning up ..." rm -rf $TEMP_DIR rm -f /usr/sbin/policy-rc.d + mv -f /sbin/start-stop-daemon.REAL /sbin/start-stop-daemon + if [ -x /sbin/initctl.REAL ]; then + mv -f /sbin/initctl.REAL /sbin/initctl + fi $sudo apt-get update -qq echo "Done" } @@ -153,6 +157,24 @@ echo "exit 101" > /usr/sbin/policy-rc.d chmod a+x /usr/sbin/policy-rc.d +mv -f /sbin/start-stop-daemon /sbin/start-stop-daemon.REAL +cat > /sbin/start-stop-daemon << EOF +#!/bin/sh + +echo "Warning: Fake start-stop-daemon called, doing nothing" +EOF +chmod 755 /sbin/start-stop-daemon + +if [ -x /sbin/initctl ]; then + mv -f /sbin/initctl /sbin/initctl.REAL + cat > /sbin/initctl << EOF +#!/bin/sh + +echo "Warning: Fake initctl called, doing nothing" +EOF + chmod 755 /sbin/initctl +fi + # Add one extra apt source for the packages included in the hwpack and make # sure it's the first on the list of sources so that it gets precedence over # the others.