X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=7a6fd87dd623a9475e9c18130c1b253e44041991;hb=e2061f4c1bb400ee9dc80d521b312ec8607375a1;hp=84118669d094e8a329def9666c3da8fef795541d;hpb=151510ee9bef12d9db4467868535822d1f55f2d2;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 8411866..7a6fd87 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -1,4 +1,4 @@ -#! /bin/bash +# $Id$ --*- sh -*-- # Copyright (C) 2003 Enrico Scholz # @@ -24,6 +24,7 @@ declare -a CHBIND_OPTS=() declare -a CAP_OPTS=() declare -a CHCONTEXT_INIT_OPTS=() declare -a CHCONTEXT_FLAG_OPTS=() +declare -a CHCONTEXT_DISCONNECT=() declare -a CHCONTEXT_OPTS=() declare -a CAPCHROOT_OPTS=() declare -a INTERFACES=() @@ -43,34 +44,15 @@ INITSTYLE=sysv S_CONTEXT= SILENT_OPT= -_NEWLINE=' -' -_NEWLINE=${_NEWLINE:0-1} : ${VSERVER_NAME:=$(basename "$VSERVER_DIR")} -if test -e "$VSERVER_DIR"/noisy; then +if test -e "$VSERVER_DIR"/noisy -o "$OPTION_VERBOSE"; then SILENT_OPT= else SILENT_OPT='--silent' fi -## Called as '_getFileValue ' -function _getFileValue -{ - test -r "$2" || return 0 - eval read "$1" <"$2" -} - -## Called as '_getFileArray ' -function _getFileArray -{ - test -r "$2" || return 0 - - local IFS=$_NEWLINE - eval "$1"='( $(< "$2") )' -} - function _generateChbindOptions { local vdir="$1" @@ -78,7 +60,7 @@ function _generateChbindOptions local bcast= local f=$vdir/interfaces/bcast - _getFileValue bcast "$f" + getFileValue bcast "$f" CHBIND_OPTS=( $SILENT_OPT ${bcast:+--bcast "$bcast"} ) @@ -127,7 +109,7 @@ function getEnterShell ENTER_SHELL=() - _getFileValue ENTER_SHELL "$vdir"/shell + getFileValue ENTER_SHELL "$vdir"/shell test "$ENTER_SHELL" || { local i @@ -144,8 +126,8 @@ function _generateInitOptions { local vdir=$1 local cfgdir=$vdir/apps/init - local runlevel_start=3 - local runlevel_stop=6 + local runlevel_start + local runlevel_stop local i f INITCMD_START=() @@ -158,14 +140,17 @@ function _generateInitOptions CHCONTEXT_INIT_OPTS=() - _getFileValue INITSTYLE "$cfgdir"/style - _getFileValue runlevel_start "$cfgdir"/runlevel - _getFileValue runlevel_start "$cfgdir"/runlevel.start - _getFileValue runlevel_stop "$cfgdir"/runlevel.stop - _getFileArray INITKILL_SEQ "$cfgdir"/killseq + getFileValue INITSTYLE "$cfgdir"/style + getFileValue runlevel_start "$cfgdir"/runlevel + getFileValue runlevel_start "$cfgdir"/runlevel.start + getFileValue runlevel_stop "$cfgdir"/runlevel.stop + getFileArray INITKILL_SEQ "$cfgdir"/killseq case x"$INITSTYLE" in xsysv) + test "$runlevel_start" || runlevel_start=3 + test "$runlevel_stop" || runlevel_stop=6 + for i in /etc/init.d/rc /etc/rc.d/rc; do test -x "$vdir/vdir/$i" || continue INITCMD_START=( "$i" "$runlevel_start" ) @@ -177,7 +162,8 @@ function _generateInitOptions xplain) INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) - CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + CHCONTEXT_INIT_OPTS=( --flag fakeinit ) + CHCONTEXT_DISCONNECT=( --disconnect ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; @@ -185,7 +171,8 @@ function _generateInitOptions xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) - CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + CHCONTEXT_INIT_OPTS=( --flag fakeinit ) + CHCONTEXT_DISCONNECT=( --disconnect ) INITCMD_START_SYNC=( "$_INITSYNC_MINIT_START" "$vdir" ) INITCMD_STOP_SYNC=( "$_INITSYNC_MINIT_STOP" "$vdir" ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) @@ -197,11 +184,11 @@ function _generateInitOptions exit 1;; esac - _getFileArray INITCMD_START "$cfgdir"/cmd.start - _getFileArray INITCMD_STOP "$cfgdir"/cmd.stop - _getFileArray INITCMD_START_SYNC "$cfgdir"/cmd.start-sync - _getFileArray INITCMD_STOP_SYNC "$cfgdir"/cmd.stop-sync - _getFileArray INITCMD_PREPARE "$cfgdir"/cmd.prepare + getFileArray INITCMD_START "$cfgdir"/cmd.start + getFileArray INITCMD_STOP "$cfgdir"/cmd.stop + getFileArray INITCMD_START_SYNC "$cfgdir"/cmd.start-sync + getFileArray INITCMD_STOP_SYNC "$cfgdir"/cmd.stop-sync + getFileArray INITCMD_PREPARE "$cfgdir"/cmd.prepare test -e "$cfgdir"/sync -o "$OPTION_FORCE_SYNC" || { @@ -223,8 +210,8 @@ function _generateFlagOptions x|x#) ;; dummy) ;; fakeinit) - CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" - --disconnect --flag --fakeinit ) + CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag fakeinit ) + CHCONTEXT_DISCONNECT=( --disconnect ) ;; *) CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" @@ -433,8 +420,16 @@ function mountVserver { local cfgdir=$1 local vdir=$1/vdir + local mtab_src test -e "$cfgdir"/fstab || return 0 + + findObject -r mtab_src "$CONFDIR"/.defaults/init/mtab "$vdir"/apps/init/mtab /dev/null + + pushd "$vdir" >/dev/null + $_CHROOT_CAT /etc/mtab <"$mtab_src" + popd >/dev/null + $_CHBIND "${CHBIND_OPTS[@]}" \ $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab }