chiark / gitweb /
build-sys: add missing sed substitution for DEBUGTTY
authorKay Sievers <kay@vrfy.org>
Mon, 25 Mar 2013 17:49:55 +0000 (18:49 +0100)
committerKay Sievers <kay@vrfy.org>
Mon, 25 Mar 2013 18:28:00 +0000 (19:28 +0100)
Makefile.am
configure.ac
units/debug-shell.service.in

index f958974..2a1a08c 100644 (file)
@@ -3734,7 +3734,8 @@ SED_PROCESS = \
                -e 's,@VERSION\@,$(VERSION),g' \
                -e 's,@rootprefix\@,$(rootprefix),g' \
                -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-               -e 's,@sushell\@,$(sushell),g' \
+               -e 's,@SUSHELL\@,$(SUSHELL),g' \
+               -e 's,@DEBUGTTY\@,$(DEBUGTTY),g' \
                -e 's,@KILL\@,$(KILL),g' \
                -e 's,@QUOTAON\@,$(QUOTAON),g' \
                -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
index d6e5a09..1c9d559 100644 (file)
@@ -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
index 50afb11..a6acad3 100644 (file)
@@ -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