e65ff3b72a
Cherry-picked from upstream. Also applied a fix for the CPUShares configuration option while I'm at it. CVE-2013-4327
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From 4731a9074538e9e24d2b81fc737917b064e194e6 Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Tue, 8 Jan 2013 18:36:28 +0100
|
|
Subject: [PATCH 06/11] Don't call "plymouth quit"
|
|
|
|
NixOS doesn't use Plymouth (yet).
|
|
---
|
|
units/emergency.service.in | 1 -
|
|
units/rescue.service.m4.in | 1 -
|
|
2 files changed, 2 deletions(-)
|
|
|
|
diff --git a/units/emergency.service.in b/units/emergency.service.in
|
|
index 442f0e0..6b7eafd 100644
|
|
--- a/units/emergency.service.in
|
|
+++ b/units/emergency.service.in
|
|
@@ -15,7 +15,6 @@ Before=shutdown.target
|
|
[Service]
|
|
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
|
|
ExecStopPost=@SYSTEMCTL@ --fail --no-block default
|
|
diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
|
|
index 269797a..2c640f4 100644
|
|
--- a/units/rescue.service.m4.in
|
|
+++ b/units/rescue.service.m4.in
|
|
@@ -16,7 +16,6 @@ Before=shutdown.target
|
|
[Service]
|
|
Environment=HOME=/root
|
|
WorkingDirectory=/root
|
|
-ExecStartPre=-/bin/plymouth quit
|
|
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=-/sbin/sulogin
|
|
ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
|
|
--
|
|
1.8.3.4
|
|
|