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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=483
This commit is contained in:
Dr. Werner Fink 2014-01-15 12:43:26 +00:00 committed by Git OBS Bridge
parent 715098eb6a
commit a7db0bbb7f
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
1017-enforce-sufficient-shutdown-warnings.patch Normal file
View File

@ -0,0 +1,24 @@
Simple fix for bnc#750845. Maybe the original values are broken as the
delay of the first two entries in when_wall() are less then the warning
intervall. Now we warn once per hour in the first 3 hours, then all
30 minutes in last hour, all 15 minutes in the last 45 minutes, all 10
minutes in the last 15 minutes, and then all minute in the last 10 minutes.
---
shutdownd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- systemd-208/src/shutdownd/shutdownd.c
+++ systemd-208/src/shutdownd/shutdownd.c 2014-01-15 12:11:23.206235784 +0000
@@ -156,8 +156,9 @@ _const_ static usec_t when_wall(usec_t n
usec_t delay;
usec_t interval;
} table[] = {
- { 0, USEC_PER_MINUTE },
- { 10 * USEC_PER_MINUTE, 15 * USEC_PER_MINUTE },
+ { 10 * USEC_PER_MINUTE, USEC_PER_MINUTE },
+ { 15 * USEC_PER_MINUTE, 10 * USEC_PER_MINUTE },
+ { 45 * USEC_PER_MINUTE, 15 * USEC_PER_MINUTE },
{ USEC_PER_HOUR, 30 * USEC_PER_MINUTE },
{ 3 * USEC_PER_HOUR, USEC_PER_HOUR },
};

8
systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 15 12:34:53 UTC 2014 - werner@suse.de
- Add patch 1017-enforce-sufficient-shutdown-warnings.patch
Warn once per hour in the last 3 hours, then all 30 minutes in last
hour, all 15 minutes in the last 45 minutes, all 10 minutes in the
last 15 minutes, and then all minute in the last 10 minutes (bnc#750845)
-------------------------------------------------------------------
Tue Jan 14 18:28:09 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -274,6 +274,8 @@ Patch1014: 1014-journald-with-journaling-FS.patch
Patch1015: build-sys-make-multi-seat-x-optional.patch
# PATCH-FIX-SUSE support-powerfail-with-powerstatus.patch
Patch1016: support-powerfail-with-powerstatus.patch
# PATCH-FIX-SUSE support-powerfail-with-powerstatus.patch
Patch1017: support-powerfail-with-powerstatus.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -557,6 +559,7 @@ cp %{SOURCE7} m4/
%patch1014 -p1
%patch1015 -p1
%patch1016 -p1
%patch1017 -p1
# ensure generate files are removed
rm -f units/emergency.service