diff --git a/dbus/check-dbus-services b/dbus/check-dbus-services index b6ead0210b77a60e1278cc4f6fbe2891acde6803..cb7a0c423dee0fd6e3167a7036b31ece3eb659df 100755 --- a/dbus/check-dbus-services +++ b/dbus/check-dbus-services @@ -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)"