[systemd-commits] 2 commits - Makefile.am src/core units/org.freedesktop.systemd1.busname

[Kay Sievers]

 Makefile.am                            |   10 ++++++----
 src/core/manager.c                     |    2 +-
 units/org.freedesktop.systemd1.busname |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 530a9662aa3d291555e5b3f6eb43199e1b04f63c
Author: Kay Sievers <kay at vrfy.org>
Date:   Wed Mar 26 03:47:03 2014 +0100

    core: do not read system boot timestamps in systemd --user mode
    
    Before:
      $ systemd-analyze --user
      Startup finished in 2.810s (firmware) + 48ms (loader) + 122ms (userspace) = 122ms
    
    After:
      $ systemd-analyze --user
      Startup finished in 122ms (userspace) = 122ms

diff --git a/src/core/manager.c b/src/core/manager.c
index 224106c..ce8759e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -422,7 +422,7 @@ int manager_new(SystemdRunningAs running_as, Manager **_m) {
                 return -ENOMEM;
 
 #ifdef ENABLE_EFI
-        if (detect_container(NULL) <= 0)
+        if (running_as == SYSTEMD_SYSTEM && detect_container(NULL) <= 0)
                 boot_timestamps(&m->userspace_timestamp, &m->firmware_timestamp, &m->loader_timestamp);
 #endif
 

commit 4851ac45269f539ff8c90fe686178128584b820c
Author: Kay Sievers <kay at vrfy.org>
Date:   Wed Mar 26 03:38:48 2014 +0100

    bus: provide org.freedesktop.systemd1.busname for systemd --user

diff --git a/Makefile.am b/Makefile.am
index a2ff014..4fe766a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3866,21 +3866,23 @@ nodist_systemunit_DATA += \
 	units/systemd-bus-driverd.service
 
 dist_systemunit_DATA += \
-	units/org.freedesktop.DBus.busname	\
+	units/org.freedesktop.DBus.busname \
 	units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname	\
+	org.freedesktop.DBus.busname \
 	org.freedesktop.systemd1.busname
 
 nodist_userunit_DATA += \
 	units/user/systemd-bus-driverd.service
 
 USER_BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname
+	org.freedesktop.DBus.busname \
+	org.freedesktop.systemd1.busname
 
 USER_UNIT_ALIASES += \
-	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
+	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname \
+	$(systemunitdir)/org.freedesktop.systemd1.busname org.freedesktop.systemd1.busname
 endif
 
 EXTRA_DIST += \
diff --git a/units/org.freedesktop.systemd1.busname b/units/org.freedesktop.systemd1.busname
index 3020f1a..bbd4e20 100644
--- a/units/org.freedesktop.systemd1.busname
+++ b/units/org.freedesktop.systemd1.busname
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=systemd busname unit
-Documentation=man:systemd-hostnamed.service(8)
+Documentation=man:systemd(1)
 Documentation=http://www.freedesktop.org/wiki/Software/systemd
 
 [BusName]