From f547f64091c11475be97b407b9734e4212de38c75ea3c7c7d5fffaf731e5d7bd Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 10 Jul 2014 13:37:08 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=710 --- ...xecStopPost-action-part-of-ExecStart.patch | 46 +++++++++++++++++++ systemd-mini.changes | 6 +++ systemd-mini.spec | 3 ++ systemd.changes | 6 +++ systemd.spec | 3 ++ 5 files changed, 64 insertions(+) create mode 100644 0001-units-make-ExecStopPost-action-part-of-ExecStart.patch diff --git a/0001-units-make-ExecStopPost-action-part-of-ExecStart.patch b/0001-units-make-ExecStopPost-action-part-of-ExecStart.patch new file mode 100644 index 00000000..bb9010bd --- /dev/null +++ b/0001-units-make-ExecStopPost-action-part-of-ExecStart.patch @@ -0,0 +1,46 @@ +Based on d3381512282f2ca1c7669f77fb736a90fdce6982 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +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 +--- + 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 diff --git a/systemd-mini.changes b/systemd-mini.changes index 682e14eb..d69f3d97 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -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 diff --git a/systemd-mini.spec b/systemd-mini.spec index f02822f3..af87c4b9 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -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 diff --git a/systemd.changes b/systemd.changes index 682e14eb..d69f3d97 100644 --- a/systemd.changes +++ b/systemd.changes @@ -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 diff --git a/systemd.spec b/systemd.spec index 8ed5a5ae..9692a388 100644 --- a/systemd.spec +++ b/systemd.spec @@ -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