From: Daniel Hokka Zakrisson Date: Fri, 3 Nov 2006 22:37:06 +0000 (+0000) Subject: Make vlogin optional. X-Git-Tag: release-0.30.212~55 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb1b131fb3e0ba481a7868359f8a2c91eb91def2;p=util-vserver.git Make vlogin optional. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2368 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/doc/configuration.xml b/doc/configuration.xml index 4acd1e6..040605f 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -196,6 +196,14 @@ operation will fail. Most tools assume 'on' as the default value. + + + + +When this file exists, vlogin isn't used on vserver <guest> enter. + + + diff --git a/scripts/functions b/scripts/functions index 51318e7..a2b4362 100644 --- a/scripts/functions +++ b/scripts/functions @@ -711,6 +711,11 @@ function killContext #$_VKILL -s CONT --xid "$1" 1 &>/dev/null || : } +function useVlogin +{ + test ! -e "$__CONFDIR/.defaults/apps/vlogin/disable" +} + ## Usage: pkgmgmt.guessStyle function pkgmgmt.guessStyle() { diff --git a/scripts/vserver b/scripts/vserver index f169c44..d72bea8 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -227,7 +227,8 @@ case "$2" in suexec 0 chkconfig "$@" ;; (enter) - OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin ) + useVlogin && \ + OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin ) getEnterShell "$VSERVER_DIR" suexec 0 "${ENTER_SHELL[@]}" ;;