[systemd-commits] configure.ac Makefile.am units/debug-shell.service.in

[Kay Sievers]

 Makefile.am                  |    3 ++-
 configure.ac                 |   12 ++++++------
 units/debug-shell.service.in |    6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 5ec6b15b65304d94dc1c8cbad05c8b996b470d3a
Author: Kay Sievers <kay at vrfy.org>
Date:   Mon Mar 25 18:49:55 2013 +0100

    build-sys: add missing sed substitution for DEBUGTTY

diff --git a/Makefile.am b/Makefile.am
index f958974..2a1a08c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3734,7 +3734,8 @@ SED_PROCESS = \
 		-e 's, at VERSION\@,$(VERSION),g' \
 		-e 's, at rootprefix\@,$(rootprefix),g' \
 		-e 's, at udevlibexecdir\@,$(udevlibexecdir),g' \
-		-e 's, at sushell\@,$(sushell),g' \
+		-e 's, at SUSHELL\@,$(SUSHELL),g' \
+		-e 's, at DEBUGTTY\@,$(DEBUGTTY),g' \
 		-e 's, at KILL\@,$(KILL),g' \
 		-e 's, at QUOTAON\@,$(QUOTAON),g' \
 		-e 's, at QUOTACHECK\@,$(QUOTACHECK),g' \
diff --git a/configure.ac b/configure.ac
index d6e5a09..1c9d559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,11 +275,11 @@ if test "x$enable_selinux" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
 if test "x${have_selinux}" != xno ; then
-        sushell=/sbin/sushell
+        SUSHELL=/sbin/sushell
 else
-        sushell=/bin/sh
+        SUSHELL=/bin/sh
 fi
-AC_SUBST(sushell)
+AC_SUBST(SUSHELL)
 
 # ------------------------------------------------------------------------------
 have_xz=no
@@ -755,13 +755,13 @@ AS_IF([test "x$enable_keymap" = "xyes"], [
 AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
 
 # ------------------------------------------------------------------------------
-debugshell=/dev/tty9
+DEBUGTTY=/dev/tty9
 AC_ARG_WITH([debugshelltty],
         [AS_HELP_STRING([--with-debugshelltty=PATH],
                 [Specify the tty device for debug shell])],
-        [debugshell="$withval"],
+        [DEBUGTTY="$withval"],
         [])
-AC_SUBST(debugshell)
+AC_SUBST(DEBUGTTY)
 
 # ------------------------------------------------------------------------------
 have_manpages=no
diff --git a/units/debug-shell.service.in b/units/debug-shell.service.in
index 50afb11..a6acad3 100644
--- a/units/debug-shell.service.in
+++ b/units/debug-shell.service.in
@@ -6,18 +6,18 @@
 #  (at your option) any later version.
 
 [Unit]
-Description=Early root shell on @debugshell@ FOR DEBUGGING ONLY
+Description=Early root shell on @DEBUGTTY@ FOR DEBUGGING ONLY
 Documentation=man:sushell(8)
 DefaultDependencies=no
 IgnoreOnIsolate=yes
 
 [Service]
 Environment=TERM=linux
-ExecStart=@sushell@
+ExecStart=@SUSHELL@
 Restart=always
 RestartSec=0
 StandardInput=tty
-TTYPath=@debugshell@
+TTYPath=@DEBUGTTY@
 TTYReset=yes
 TTYVHangup=yes
 KillMode=process