]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
systemd: drop machine UUID generation for unit file
authorLennart Poettering <lennart@poettering.net>
Thu, 2 Feb 2012 01:11:11 +0000 (02:11 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 7 Feb 2012 16:40:36 +0000 (16:40 +0000)
To optimize startup a bit, drop machine UUID generation from the unit
file. Since a while D-Bus was already capable of making use of the
/etc/machine-id file, which is guaranteed to exist on systemd systems
(since the first released versions already), hence there's no need to
ever generate a D-Bus specific machine ID.

In times where userspace takes < 800ms to boot up getting rid of this
process optimizes boot time further.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45520
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
bus/dbus.service.in

index 8b87a58e7a77e0a82cb5a82b916410dfd59ff7d8..8ab067f641f7eba73e9623bb65661782b59323ca 100644 (file)
@@ -4,7 +4,6 @@ Requires=dbus.socket
 After=syslog.target
 
 [Service]
-ExecStartPre=@EXPANDED_BINDIR@/dbus-uuidgen --ensure
 ExecStartPre=-/bin/rm -f @DBUS_SYSTEM_PID_FILE@
 ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --systemd-activation
 ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig