Skip to content
Snippets Groups Projects
Commit 9e9aa738 authored by Simon McVittie's avatar Simon McVittie
Browse files

check-dbus-services: do not special-case com.chaiwala.Updater


This came from the chaiwala-btrfs package, which we haven't shipped
since 15.12.

Reviewed-by: default avatarSjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D3897
parent 63eea48d
No related branches found
No related tags found
No related merge requests found
......@@ -154,27 +154,12 @@ for service in *.service; do
fail "$name" "matching systemd service $systemd_service not found"
fi
if [ "${bus}:${bus_name}" = "system:com.chaiwala.Updater" ] &&
! [ -e /dev/disk/by-partlabel/flags ]; then
# LAVA dismantles and reassembles our images, so it does not have
# the partition layout required by the updater.
# https://bugs.apertis.org/show_bug.cgi?id=484
skip "$name" "chaiwala-btrfs-updater is not available on LAVA"
elif [ "${bus}:${bus_name}" = "system:org.freedesktop.thermald" ] &&
if [ "${bus}:${bus_name}" = "system:org.freedesktop.thermald" ] &&
systemd-detect-virt --quiet; then
skip "$name" "thermald does not make sense in a virtual machine"
elif ! run_verbose gdbus call --$bus -d "$bus_name" -o / \
-m org.freedesktop.DBus.Peer.Ping; then
case "${bus}:$bus_name" in
(system:com.chaiwala.Updater)
# chaiwala-btrfs-updater currently only responds to user, not root
xfail "$name" "could not ping $bus_name as root, trying as user"
if ! sudo -u user gdbus call --$bus -d "$bus_name" -o / \
-m org.freedesktop.DBus.Peer.Ping; then
fail "$name" "could not ping $bus_name"
fi
;;
(session:ca.desrt.dconf-editor)
# https://bugs.apertis.org/show_bug.cgi?id=431
xfail "$name" "could not ping $bus_name (bug: Apertis #431)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment