X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=e02c0ddf23eb1a7c7d91534df73e983a04488708;hb=bb23ba0d1b3ab139512fd137a5e7f7241a49c2d6;hp=7c74f46902716df246c2582e49973a365098b423;hpb=ca07a4105556eae7e370fd619d4c8463d6214996;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 7c74f46..e02c0dd 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -38,6 +38,7 @@ declare -a ENTER_SHELL=() INTERFACE_CMDS_IDX=0 _HAVE_INTERFACE_OPTIONS= +_HAVE_CHBIND_OPTIONS= INITSTYLE=sysv @@ -59,6 +60,8 @@ function _generateChbindOptions local i local bcast= + test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$vdir" + local f=$vdir/interfaces/bcast getFileValue bcast "$f" @@ -67,6 +70,8 @@ function _generateChbindOptions for i in "${INTERFACES[@]}"; do CHBIND_OPTS=( "${CHBIND_OPTS[@]}" --ip "$i" ) done + + _HAVE_CHBIND_OPTIONS=1 } function _generateNiceCommand @@ -122,6 +127,23 @@ function getEnterShell } } +## Usage: sendKillSequence [ ]* +function sendKillSequence +{ + local ctx=$1 + local wait= + shift + + while isCtxRunning "$ctx"; do + test -z "$wait" || sleep "$wait" + + $_VKILL -c "$ctx" ${1:+-s "$1"} + test "$2" || break + wait="$2" + shift 2 + done +} + function _generateInitOptions { local vdir=$1 @@ -144,7 +166,7 @@ function _generateInitOptions getFileValue runlevel_start "$cfgdir"/runlevel getFileValue runlevel_start "$cfgdir"/runlevel.start getFileValue runlevel_stop "$cfgdir"/runlevel.stop - getFileArray INITKILL_SEQ "$cfgdir"/killseq + getFileArray INITKILL_SEQ "$cfgdir"/killseq case x"$INITSTYLE" in xsysv) @@ -206,8 +228,7 @@ function _generateFlagOptions while read flag; do case x"$flag" in x|x#) ;; - dummy) ;; - fakeinit) + xfakeinit) CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) ;; *) @@ -409,7 +430,7 @@ function prepareInit function generateOptions { _generateInterfaceOptions "$1" - _generateChbindOptions "$1" + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" _generateNiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" @@ -418,19 +439,24 @@ function generateOptions function mountVserver { local cfgdir=$1 + local ns_opt=$2 local vdir=$1/vdir local mtab_src test -e "$cfgdir"/fstab || return 0 - findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab /dev/null + findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab "$PKGLIBDEFAULTDIR"/mtab /dev/null pushd "$vdir" >/dev/null $_CHROOT_CAT /etc/mtab <"$mtab_src" popd >/dev/null + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" $_CHBIND "${CHBIND_OPTS[@]}" \ $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab + + isAvoidNamespace "$cfgdir" || \ + $_SECURE_MOUNT --rbind -n "$vdir" "/" } function umountVserver @@ -440,7 +466,9 @@ function umountVserver is_ok=1 - test -e "$cfgdir"/fstab || return 0 + isAvoidNamespace "$cfgdir" || return 0 + test -e "$cfgdir"/fstab || return 0 + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" pushd "$vdir/" >/dev/null tac "$cfgdir"/fstab | while read src dst tmp; do @@ -449,8 +477,8 @@ function umountVserver x#*) continue;; esac - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_UMOUNT "$dst" || is_ok= + $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \ + $_UMOUNT -lfn . || is_ok= done popd >/dev/null