rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 128831 from Base:System

Browse Source 
- Add fix-analyze-exception.patch: prevent exception if running
  systemd-analyze before boot is complete (bnc#772506) (forwarded request 128829 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/128831
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=108
This commit is contained in:
Stephan Kulow 2012-07-25 08:44:48 +00:00 committed by Git OBS Bridge
commit 3a302174fc
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fix-analyze-exception.patch Normal file
View File

@ -0,0 +1,29 @@
From 6070fe66ac2f317e7e85e5685f0916d1e2b73a28 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Mon, 2 Apr 2012 11:08:20 +0100
Subject: [PATCH] analyze: Cosmetic exit when the bootup is not yet complete
when plotting.
This is just a nicer message than a python traceback.
---
src/systemd-analyze | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/systemd-analyze b/src/systemd-analyze
index 8148bfb..a49fbb7 100755
--- 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
--
1.7.10.4

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 23 08:28:15 UTC 2012 - fcrozat@suse.com
- Add fix-analyze-exception.patch: prevent exception if running
systemd-analyze before boot is complete (bnc#772506)
-------------------------------------------------------------------
Fri Jul 20 19:24:08 CEST 2012 - sbrabec@suse.cz

2
systemd.spec
View File

@ -98,6 +98,7 @@ Patch49: ulimit-support.patch
Patch50: change-terminal.patch
Patch51: fix-tty-startup.patch
Patch52: fix-write-user-state-file.patch
Patch54: fix-analyze-exception.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -177,6 +178,7 @@ at boot.
%patch51 -p1
%patch52 -p1
%patch53 -p1
%patch54 -p1
#needed by patch49
rm man/systemd.conf.5