pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=710
This commit is contained in:
Dr. Werner Fink 2014-07-10 13:37:08 +00:00 committed by Git OBS Bridge
parent b1aa3ea339
commit b635978dbc
5 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-units-make-ExecStopPost-action-part-of-ExecStart.patch Normal file
View File

@ -0,0 +1,46 @@
Based on d3381512282f2ca1c7669f77fb736a90fdce6982 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Tue, 8 Jul 2014 17:42:23 +0200
Subject: [PATCH] units: make ExecStopPost action part of ExecStart
Currently after exiting rescue shell we isolate default target. User
might want to isolate to some other target than default one. However
issuing systemctl isolate command to desired target would bring system
to default target as a consequence of running ExecStopPost action.
Having common ancestor for rescue shell and possible followup systemctl
default command should fix this. If user exits rescue shell we will
proceed with isolating default target, otherwise, on manual isolate,
parent shell process is terminated and we don't isolate default target,
but target chosen by user.
Suggested-by: Michal Schmidt <mschmidt@redhat.com>
---
units/emergency.service.in | 3 +--
units/rescue.service.m4.in | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
--- units/emergency.service.in
+++ units/emergency.service.in 2014-07-10 13:31:50.662235825 +0000
@@ -18,8 +18,7 @@ WorkingDirectory=/root
ExecStartPre=-/usr/bin/plymouth quit
ExecStartPre=-/usr/bin/plymouth --wait
ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
-ExecStart=-/usr/sbin/sulogin
-ExecStopPost=@SYSTEMCTL@ --fail --no-block default
+ExecStart=-/bin/sh -c "/usr/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
Type=idle
StandardInput=tty-force
StandardOutput=inherit
--- units/rescue.service.m4.in
+++ units/rescue.service.m4.in 2014-07-10 13:32:15.678235509 +0000
@@ -19,8 +19,7 @@ WorkingDirectory=/root
ExecStartPre=-/usr/bin/plymouth quit
ExecStartPre=-/usr/bin/plymouth --wait
ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
-ExecStart=-/usr/sbin/sulogin
-ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
+ExecStart=-/bin/sh -c "/usr/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
Type=idle
StandardInput=tty-force
StandardOutput=inherit

6
systemd-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 10 13:33:32 UTC 2014 - werner@suse.de
- Port and add upstream patch
0001-units-make-ExecStopPost-action-part-of-ExecStart.patch
-------------------------------------------------------------------
Wed Jul 9 13:14:02 UTC 2014 - werner@suse.de

3
systemd-mini.spec
View File

@ -675,6 +675,8 @@ Patch330: 0002-journal-compress-improve-xz-compression-performance.patch
Patch331: 0001-logind-allow-switching-to-unused-VTs-via-SwitchTo.patch
# PATCH-FIX-UPSTREAM added at 2014/07/09
Patch332: 0002-hostnamed-add-a-new-chassis-type-for-watches.patch
# PATCH-FIX-UPSTREAM added at 2014/07/10
Patch333: 0001-units-make-ExecStopPost-action-part-of-ExecStart.patch
# UDEV PATCHES
# ============
@ -1270,6 +1272,7 @@ cp %{SOURCE7} m4/
%patch330 -p0
%patch331 -p0
%patch332 -p0
%patch333 -p0
# udev patches
%patch1001 -p1

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 10 13:33:32 UTC 2014 - werner@suse.de
- Port and add upstream patch
0001-units-make-ExecStopPost-action-part-of-ExecStart.patch
-------------------------------------------------------------------
Wed Jul 9 13:14:02 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -670,6 +670,8 @@ Patch330: 0002-journal-compress-improve-xz-compression-performance.patch
Patch331: 0001-logind-allow-switching-to-unused-VTs-via-SwitchTo.patch
# PATCH-FIX-UPSTREAM added at 2014/07/09
Patch332: 0002-hostnamed-add-a-new-chassis-type-for-watches.patch
# PATCH-FIX-UPSTREAM added at 2014/07/10
Patch333: 0001-units-make-ExecStopPost-action-part-of-ExecStart.patch
# UDEV PATCHES
# ============
@ -1265,6 +1267,7 @@ cp %{SOURCE7} m4/
%patch330 -p0
%patch331 -p0
%patch332 -p0
%patch333 -p0
# udev patches
%patch1001 -p1