udev: fix test-udev binary

[elogind.git] / src / systemd-analyze

diff --git a/src/systemd-analyze b/src/systemd-analyze
index 729aa05ca10a806a0944c8fd294ae9759ca55d19..a49fbb7eb057cac4685294767a9e51e2434b9e56 100755 (executable)
--- a/src/systemd-analyze
+++ b/src/systemd-analyze
@@ -31,6 +31,10 @@ def acquire_start_time():
         startup_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'StartupTimestampMonotonic'))
         finish_time = int(properties.Get('org.freedesktop.systemd1.Manager', 'FinishTimestampMonotonic'))
 
+        if finish_time == 0:
+                sys.stderr.write("Bootup is not yet finished. Please try again later.\n")
+                sys.exit(1)
+
         assert initrd_time <= startup_time
         assert startup_time <= finish_time
 
@@ -164,7 +168,15 @@ elif sys.argv[1] == 'plot':
         context.stroke()
         context.restore()
 
-        banner = "Running on %s (%s %s) %s" % (os.uname()[1], os.uname()[2], os.uname()[3], os.uname()[4])
+        osrel = "Linux"
+        if os.path.exists("/etc/os-release"):
+                for line in open("/etc/os-release"):
+                        if line.startswith('PRETTY_NAME='):
+                                osrel = line[12:]
+                                osrel = osrel.strip('\"\n')
+                                break
+
+        banner = "{} {} ({} {}) {}".format(osrel, *(os.uname()[1:5]))
         draw_text(context, 0, -15, banner, hcenter = 0, vcenter = 1)
 
         for x in range(0, finish_time/10000 + 100, 100):