util: /etc/machine-id should be tried first, the D-Bus only as fallback for legacy systems

This commit is contained in:
Lennart Poettering 2012-05-15 14:10:34 +02:00
parent 3173358f76
commit 10f146ddc8
2 changed files with 5 additions and 5 deletions

View file

@ -945,9 +945,9 @@ AC_SUBST(HAVE_DBUS)
AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
PA_MACHINE_ID="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
PA_MACHINE_ID_FALLBACK="${sysconfdir}/machine-id"
PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])