commit 3d8ebe7fa88e003e24dafa1cef88c714e7f0cb58
author Mattias Nissler <mnissler@chromium.org> Thu May 11 11:45:39 2017 +0200
committer chrome-bot <chrome-bot@chromium.org> Mon May 15 08:18:23 2017 -0700
tree ed7e314d2a5c52ab0a5d071ae34daf6db842ede9
parent 4b37620b6b9f8aa36a9d5fef42832d81ea9f868c

Adjust network_chroot.py for DBus path change.

The DBus socket is now accessed via /run/dbus, so bind-mount that
instead of /var/run/dbus.

BUG=None
TEST=peerd_DiscoverServices passes.
CQ-DEPEND=CL:501927

Change-Id: I4f152a1bd34be82341fd17b5075c5a137f80d9d1
Reviewed-on: https://chromium-review.googlesource.com/503268
Commit-Ready: Mattias Nissler <mnissler@chromium.org>
Tested-by: Mattias Nissler <mnissler@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

client/cros/network_chroot.py

diff --git a/client/cros/network_chroot.py b/client/cros/network_chroot.py
index 3215e8c..1d62008 100644
--- a/client/cros/network_chroot.py
+++ b/client/cros/network_chroot.py
@@ -35,7 +35,7 @@
     BIND_ROOT_WRITABLE_DIRECTORIES = frozenset(('dev/pts',))
     # Directories we'll bind mount when we want to bridge DBus namespaces.
     # Includes directories containing the system bus socket and machine ID.
-    DBUS_BRIDGE_DIRECTORIES = ('var/run/dbus/', 'var/lib/dbus/')
+    DBUS_BRIDGE_DIRECTORIES = ('run/dbus/', 'var/lib/dbus/')
 
     ROOT_DIRECTORIES = ('etc',  'tmp', 'var', 'var/log', 'var/run')
     STARTUP = 'etc/chroot_startup.sh'