From ab734fcebe258c94f1bd734dc9983533e9241c1139ada53ae8e10b4969723e66 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sun, 14 Jul 2013 13:56:23 +0000 Subject: [PATCH] Accepting request 183009 from home:arvidjaar:branches:Base:System 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 --- systemd-mini.changes | 6 ++++ systemd-mini.spec | 3 ++ systemd.changes | 6 ++++ systemd.spec | 3 ++ ...r-sbin-sulogin-for-emergency-service.patch | 31 +++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 use-usr-sbin-sulogin-for-emergency-service.patch diff --git a/systemd-mini.changes b/systemd-mini.changes index c8c5872d..2eba47e2 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -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 diff --git a/systemd-mini.spec b/systemd-mini.spec index e4e23082..27abe6b8 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -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 diff --git a/systemd.changes b/systemd.changes index c8c5872d..2eba47e2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -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 diff --git a/systemd.spec b/systemd.spec index df449218..7b368d0d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -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 diff --git a/use-usr-sbin-sulogin-for-emergency-service.patch b/use-usr-sbin-sulogin-for-emergency-service.patch new file mode 100644 index 00000000..6dbd5882 --- /dev/null +++ b/use-usr-sbin-sulogin-for-emergency-service.patch @@ -0,0 +1,31 @@ +From: Andrey Borzenkov +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