More polkit-parsing.sh cleanup

• polkit-parsing.sh:

  • Adjust system bus socket to /run/dbus/system_bus_socket

    • In Debian system bus socket moved from /var/run/dbus/system_bus_socket to /run/dbus/system_bus_socket, a symlink exists from /var/run/... to /run/... but let's use the real path.

  • Give more time to polkitd to be ready

    • For unknown reasons (race conditions?), pkaction randomly fails with: "Error enumerating actions: GDBus.Error:org.freedesktop.DBus.Error.NoReply: Message recipient disconnected from message bus without replying" So, to mitigate this issue give it some more time to be ready, although this should be the aim of "gdbus wait"

  • Improve cleanup() to catch unexpected failures and to ignore expected one since polkitd should already be killed in the script body.

  • Drop 'set -x' in cleanup() to reduce noise in the log

common/polkit-parsing.sh

@@ -7,10 +7,11 @@ TMPFILE=`mktemp`
 
 cleanup () {
 	rv=$?
-	set -e
-	set -x
 
-	sudo pkill -9 polkitd
+	# polkitd should be killed in the script body, so in that case the
+	# following command will fail (hence the ||true). But if an error occurs
+	# before the pkill is reached, then we still need to kill it here.
+	sudo pkill -9 polkitd  >/dev/null 2>&1 || true
 	rm -f "$TMPFILE"
 
 	# Be nice and leave polkit running as normal.
@@ -35,9 +36,16 @@ fi
 ( set +e; sudo ${polkitd} --replace 2>&1 ) | sed 's/^/# /' | tee $TMPFILE &
 
 # Wait for it to start.
-gdbus wait --address unix:path=/var/run/dbus/system_bus_socket \
+gdbus wait --address unix:path=/run/dbus/system_bus_socket \
         org.freedesktop.PolicyKit1
 
+# For unknown reasons (race conditions?), pkaction randomly fails with:
+# "Error enumerating actions: GDBus.Error:org.freedesktop.DBus.Error.NoReply:
+#  Message recipient disconnected from message bus without replying"
+# So, to mitigate this issue give it some more time to be ready,
+# although this should be the aim of "gdbus wait" above.
+sleep 5
+
 # Query for actions, which forces polkit to parse all the policy files and
 # output warnings if any are malformed.
 #