From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 30 May 2017 21:03:25 +0000 (-0400)
Subject: sulogin-shell: avoid heredocs
X-Git-Tag: v234~152^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce241a493fdb408dcc505145712cc5f6a8254706;p=thirdparty%2Fsystemd.git

sulogin-shell: avoid heredocs

They require a writable /tmp dir (in the bash implementation).
Let's use echo, and not 'echo -e' since that doesn't seem to be completely
portable.

Fixes #6052.
---

diff --git a/src/sulogin-shell/systemd-sulogin-shell.in b/src/sulogin-shell/systemd-sulogin-shell.in
index d4f32af5f98..103f841a576 100755
--- a/src/sulogin-shell/systemd-sulogin-shell.in
+++ b/src/sulogin-shell/systemd-sulogin-shell.in
@@ -4,11 +4,9 @@ if [ -x /bin/plymouth ]; then
     /bin/plymouth --wait quit
 fi
 
-cat <<EOF
-You are in $1 mode. After logging in, type "journalctl -xb" to view
-system logs, "systemctl reboot" to reboot, "systemctl default" or ^D to
-boot into default mode.
-EOF
+echo "You are in $1 mode. After logging in, type \"journalctl -xb\" to view"
+echo "system logs, \"systemctl reboot\" to reboot, \"systemctl default\" or ^D to boot"
+echo "into default mode."
 
 @SULOGIN@
 @SYSTEMCTL@ --job-mode=fail --no-block default