shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-03 01:17:45 +03:00
Code

build-sys: add missing sed substitution for DEBUGTTY

Browse Source
This commit is contained in:
Kay Sievers 2013-03-25 18:49:55 +01:00
parent d95fd3df59
commit 5ec6b15b65
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -3734,7 +3734,8 @@ SED_PROCESS = \
-e 's,@VERSION\@,$(VERSION),g' \ -e 's,@VERSION\@,$(VERSION),g' \
-e 's,@rootprefix\@,$(rootprefix),g' \ -e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),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,@KILL\@,$(KILL),g' \
-e 's,@QUOTAON\@,$(QUOTAON),g' \ -e 's,@QUOTAON\@,$(QUOTAON),g' \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \ -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \

12
configure.ac
View File

@ -275,11 +275,11 @@ if test "x$enable_selinux" != "xno"; then
fi fi
AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"]) AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
if test "x${have_selinux}" != xno ; then if test "x${have_selinux}" != xno ; then
sushell=/sbin/sushell SUSHELL=/sbin/sushell
else else
sushell=/bin/sh SUSHELL=/bin/sh
fi fi
AC_SUBST(sushell) AC_SUBST(SUSHELL)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
have_xz=no have_xz=no
@ -755,13 +755,13 @@ AS_IF([test "x$enable_keymap" = "xyes"], [
AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"]) AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
debugshell=/dev/tty9 DEBUGTTY=/dev/tty9
AC_ARG_WITH([debugshelltty], AC_ARG_WITH([debugshelltty],
[AS_HELP_STRING([--with-debugshelltty=PATH], [AS_HELP_STRING([--with-debugshelltty=PATH],
[Specify the tty device for debug shell])], [Specify the tty device for debug shell])],
[debugshell="$withval"], [DEBUGTTY="$withval"],
[]) [])
AC_SUBST(debugshell) AC_SUBST(DEBUGTTY)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
have_manpages=no have_manpages=no

6
units/debug-shell.service.in
View File

@ -6,18 +6,18 @@
# (at your option) any later version. # (at your option) any later version.
[Unit] [Unit]
Description=Early root shell on @debugshell@ FOR DEBUGGING ONLY Description=Early root shell on @DEBUGTTY@ FOR DEBUGGING ONLY
Documentation=man:sushell(8) Documentation=man:sushell(8)
DefaultDependencies=no DefaultDependencies=no
IgnoreOnIsolate=yes IgnoreOnIsolate=yes
[Service] [Service]
Environment=TERM=linux Environment=TERM=linux
ExecStart=@sushell@ ExecStart=@SUSHELL@
Restart=always Restart=always
RestartSec=0 RestartSec=0
StandardInput=tty StandardInput=tty
TTYPath=@debugshell@ TTYPath=@DEBUGTTY@
TTYReset=yes TTYReset=yes
TTYVHangup=yes TTYVHangup=yes
KillMode=process KillMode=process