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>
This commit is contained in:
Jim Hebert 2012-03-21 11:26:34 -07:00 committed by Gerrit
parent 639b34c880
commit fb97704081
2 changed files with 2 additions and 10 deletions

View File

@ -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

View File

@ -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.