From fb9770408186b3c70a77687c9a8b43498cccba4d Mon Sep 17 00:00:00 2001
From: Jim Hebert <jimhebert@chromium.org>
Date: Wed, 21 Mar 2012 11:26:34 -0700
Subject: [PATCH] Move enable-dbus-monitor to be a mod_for_dbusspy behavior

BUG=chromium-os:27091
TEST=mod_test_image_for_dbusspy test.bin

Change-Id: Ia2b84f314bd97f138680b7b05e00ff456d405bb0
Reviewed-on: https://gerrit.chromium.org/gerrit/18678
Reviewed-by: Jim Hebert <jimhebert@chromium.org>
Tested-by: Jim Hebert <jimhebert@chromium.org>
Commit-Ready: Jim Hebert <jimhebert@chromium.org>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
---
 .../system-local.conf                                  | 10 ----------
 mod_test_image_for_dbusspy.sh                          |  2 ++
 2 files changed, 2 insertions(+), 10 deletions(-)
 rename mod_for_test_scripts/760enableDbusMonitor => mod_for_dbusspy/system-local.conf (60%)
 mode change 100755 => 100644

diff --git a/mod_for_test_scripts/760enableDbusMonitor b/mod_for_dbusspy/system-local.conf
old mode 100755
new mode 100644
similarity index 60%
rename from mod_for_test_scripts/760enableDbusMonitor
rename to mod_for_dbusspy/system-local.conf
index 7143b1dc87..4c98398dd9
--- a/mod_for_test_scripts/760enableDbusMonitor
+++ b/mod_for_dbusspy/system-local.conf
@@ -1,12 +1,3 @@
-#!/bin/bash
-
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-echo "Configuring to enable root access to dbus-monitor"
-
-cat > "${ROOT_FS_DIR}/etc/dbus-1/system-local.conf" <<EOF
 <busconfig>
   <policy context="default">
     <!-- All messages may be received by default -->
@@ -16,4 +7,3 @@ cat > "${ROOT_FS_DIR}/etc/dbus-1/system-local.conf" <<EOF
     <allow receive_requested_reply="false" receive_type="signal" eavesdrop="true"/>
   </policy>
 </busconfig>
-EOF
diff --git a/mod_test_image_for_dbusspy.sh b/mod_test_image_for_dbusspy.sh
index a561759698..aaa4dcb7a9 100755
--- a/mod_test_image_for_dbusspy.sh
+++ b/mod_test_image_for_dbusspy.sh
@@ -32,6 +32,7 @@ IMAGE_DIR=$(dirname "${FLAGS_image}")
 IMAGE_NAME=$(basename "${FLAGS_image}")
 ROOT_FS_DIR="${IMAGE_DIR}/rootfs"
 DBUS_CONF="$(dirname "$0")/mod_for_dbusspy/dbus.conf"
+SYSTEM_LOCAL_CONF="$(dirname "$0")/mod_for_dbusspy/system-local.conf"
 DEVKEYS_DIR="/usr/share/vboot/devkeys"
 VBOOT_DIR="${CHROOT_TRUNK_DIR}/src/platform/vboot_reference/scripts/"\
 "image_signing"
@@ -59,6 +60,7 @@ trap cleanup EXIT
 sudo cp -a "${ROOT_FS_DIR}/etc/init/dbus.conf" \
   "${ROOT_FS_DIR}/etc/init/realdbus.conf"
 sudo cp "${DBUS_CONF}" "${ROOT_FS_DIR}/etc/init/dbus.conf"
+sudo cp "${SYSTEM_LOCAL_CONF}" "${ROOT_FS_DIR}/etc/dbus-1/system-local.conf"
 
 # Unmount and re-sign. See crosbug.com/18709 for why this isn't using
 # cros_make_image_bootable.