gpt-auto-generator: skip nonexistent devices

[elogind.git] / src / libsystemd-bus / bus-util.c

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index f96c293984b014220f7d25cc63b721c63e069189..a468bcad6b81dfb7dbd0c02c9c3d1ed72aaba8cb 100644 (file)
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -483,7 +483,7 @@ int bus_open_system_systemd(sd_bus **_bus) {
         if (r < 0)
                 return r;
 
-        r = sd_bus_set_address(bus, "kernel:path=/dev/kdbus/0-system/bus");
+        r = sd_bus_set_address(bus, KERNEL_SYSTEM_BUS_PATH);
         if (r < 0)
                 return r;
 
@@ -536,7 +536,7 @@ int bus_open_user_systemd(sd_bus **_bus) {
         if (r < 0)
                 return r;
 
-        if (asprintf(&bus->address, "kernel:path=/dev/kdbus/%lu-user/bus", (unsigned long) getuid()) < 0)
+        if (asprintf(&bus->address, KERNEL_USER_BUS_FMT, (unsigned long) getuid()) < 0)
                 return -ENOMEM;
 
         bus->bus_client = true;
@@ -553,7 +553,7 @@ int bus_open_user_systemd(sd_bus **_bus) {
 
         e = secure_getenv("XDG_RUNTIME_DIR");
         if (!e)
-                return sd_bus_open_system(_bus);
+                return sd_bus_open_user(_bus);
 
         ee = bus_address_escape(e);
         if (!ee)
@@ -569,7 +569,7 @@ int bus_open_user_systemd(sd_bus **_bus) {
 
         r = sd_bus_start(bus);
         if (r < 0)
-                return sd_bus_open_system(_bus);
+                return sd_bus_open_user(_bus);
 
         r = bus_check_peercred(bus);
         if (r < 0)