diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-03-25 18:49:55 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-03-25 19:28:00 +0100 |
| commit | 5ec6b15b65304d94dc1c8cbad05c8b996b470d3a (patch) | |
| tree | 0e16c73801bffdc26eba7745bd80e584095d1620 | |
| parent | d95fd3df5997b0dab8650d9427997d295d0975e3 (diff) | |
build-sys: add missing sed substitution for DEBUGTTY
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | units/debug-shell.service.in | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index f958974833..2a1a08ce9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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' \ diff --git a/configure.ac b/configure.ac index d6e5a090bd..1c9d5596ea 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 50afb11e90..a6acad3ec5 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 |