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

Accepting request 183009 from home:arvidjaar:branches:Base:System

Browse Source 
emergency.service failed to start because sulogin is in /usr/sbin now.
Add use-usr-sbin-sulogin-for-emergency-service.patch to fix the path in unit file.

OBS-URL: https://build.opensuse.org/request/show/183009
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=415
This commit is contained in:
Dr. Werner Fink 2013-07-14 13:56:23 +00:00 committed by Git OBS Bridge
parent b6d161fd43
commit 2c9ad1c6b2
5 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemd-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jul 14 05:25:51 UTC 2013 - arvidjaar@gmail.com
- use-usr-sbin-sulogin-for-emergency-service.patch
emergency.service failed to start because sulogin is in /usr/sbin now
-------------------------------------------------------------------
Fri Jul 12 17:09:23 CEST 2013 - mls@suse.de

3
systemd-mini.spec
View File

@ -176,6 +176,8 @@ Patch24: handle-etc-HOSTNAME.patch
Patch25: Forward-suspend-hibernate-calls-to-pm-utils.patch
# PATCH-FIX-UPSTREAM rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch rjschwei@suse.com -- add lid switch of ARM based Chromebook as a power switch to logind
Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch
# PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin
Patch46: use-usr-sbin-sulogin-for-emergency-service.patch
# udev patches
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
@ -413,6 +415,7 @@ cp %{SOURCE7} m4/
%patch43 -p1
%patch44 -p1
%patch45 -p1
%patch46 -p1
# udev patches
%patch1001 -p1

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jul 14 05:25:51 UTC 2013 - arvidjaar@gmail.com
- use-usr-sbin-sulogin-for-emergency-service.patch
emergency.service failed to start because sulogin is in /usr/sbin now
-------------------------------------------------------------------
Fri Jul 12 17:09:23 CEST 2013 - mls@suse.de

3
systemd.spec
View File

@ -171,6 +171,8 @@ Patch24: handle-etc-HOSTNAME.patch
Patch25: Forward-suspend-hibernate-calls-to-pm-utils.patch
# PATCH-FIX-UPSTREAM rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch rjschwei@suse.com -- add lid switch of ARM based Chromebook as a power switch to logind
Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch
# PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin
Patch46: use-usr-sbin-sulogin-for-emergency-service.patch
# udev patches
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
@ -408,6 +410,7 @@ cp %{SOURCE7} m4/
%patch43 -p1
%patch44 -p1
%patch45 -p1
%patch46 -p1
# udev patches
%patch1001 -p1

31
use-usr-sbin-sulogin-for-emergency-service.patch Normal file
View File

@ -0,0 +1,31 @@
From: Andrey Borzenkov <arvidjaar@gmail.com>
Subject: use /usr/sbin/sulogin in emergency service
In current Factory sulogin is in /usr/sbin which makes it impossible
to enter emergency service.
Index: systemd-205/units/emergency.service
===================================================================
--- systemd-205.orig/units/emergency.service
+++ systemd-205/units/emergency.service
@@ -17,7 +17,7 @@ Environment=HOME=/root
WorkingDirectory=/root
ExecStartPre=-/bin/plymouth quit
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=-/sbin/sulogin
+ExecStart=-/usr/sbin/sulogin
ExecStopPost=/usr/bin/systemctl --fail --no-block default
Type=idle
StandardInput=tty-force
Index: systemd-205/units/emergency.service.in
===================================================================
--- systemd-205.orig/units/emergency.service.in
+++ systemd-205/units/emergency.service.in
@@ -17,7 +17,7 @@ Environment=HOME=/root
WorkingDirectory=/root
ExecStartPre=-/bin/plymouth quit
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=-/sbin/sulogin
+ExecStart=-/usr/sbin/sulogin
ExecStopPost=@SYSTEMCTL@ --fail --no-block default
Type=idle
StandardInput=tty-force