runtime_probe: add /run/chromeos-config/v1 as a bind mount to minijail
This is a wide-change across platform2 which changes services that use
both minijail to either chroot or pivot_root, and uses libcros_config
to access model configuration.
After CL:2065478, services which require chromeos-config will need to
be able to have read access to /run/chromeos-config/v1 to read
configuration values. This adds this as a bind mount in the
appropriate upstart scripts.
BUG=b:150658730
TEST=/usr/bin/tast run -varsfile="$VARSFILE" "$ACTIVE_DUT" \
'(!disabled && "group:runtime_probe")'
Change-Id: Iafdd570977e77016bfbfc33dde6be2fcef1e7fa2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2084652
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Clark Chung <ckclark@chromium.org>
Tested-by: Clark Chung <ckclark@chromium.org>
diff --git a/runtime_probe/init/runtime_probe.conf b/runtime_probe/init/runtime_probe.conf
index 8b074ee..a4d58ba 100644
--- a/runtime_probe/init/runtime_probe.conf
+++ b/runtime_probe/init/runtime_probe.conf
@@ -10,19 +10,14 @@
stop on stopping system-services
expect fork
-# The vpd/ro and virtual/dmi mount is required to initialize cros_config.
-# Ref: //src/platform2/chromeos-config/libcros_config/cros_config.cc
-# TODO(hmchu): Make sure required file for cros_config on non-amd64 platform
-# are also mounted correctly.
script
exec minijail0 -i -e -p -r -v -l --uts -n \
-u runtime_probe -g runtime_probe -G \
--profile=minimalistic-mountns \
-k 'tmpfs,/run,tmpfs,MS_NODEV|MS_NOEXEC|MS_NOSUID,mode=755,size=10M' \
-k 'tmpfs,/sys,tmpfs,MS_NODEV|MS_NOEXEC|MS_NOSUID,mode=755,size=10M' \
+ -b /run/chromeos-config/v1 \
-b /run/dbus \
- -b /sys/firmware/vpd/ro \
- -b /sys/devices/virtual/dmi \
-S /usr/share/policy/runtime_probe-seccomp.policy \
-- /usr/bin/runtime_probe --dbus --verbosity_level=1
end script
