X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=83215c9f0eadbb2c848721b77f2b7b4c90abc3f2;hb=b30f4928376b71bd44021a951115e848e925d198;hp=84118669d094e8a329def9666c3da8fef795541d;hpb=151510ee9bef12d9db4467868535822d1f55f2d2;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 8411866..83215c9 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 # @@ -36,55 +36,47 @@ declare -a INITCMD_PREPARE=() declare -a INITKILL_SEQ=() declare -a ENTER_SHELL=() +declare -a OPTS_VCONTEXT_CREATE=() +declare -a OPTS_VCONTEXT_MIGRATE=() +declare -a OPTS_VATTRIBUTE=() +USE_VNAMESPACE= + INTERFACE_CMDS_IDX=0 +_HAVE_INTERFACE_OPTIONS= +_HAVE_CHBIND_OPTIONS= 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" local i local bcast= + test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$vdir" + local f=$vdir/interfaces/bcast - _getFileValue bcast "$f" + getFileValue bcast "$f" CHBIND_OPTS=( $SILENT_OPT ${bcast:+--bcast "$bcast"} ) for i in "${INTERFACES[@]}"; do CHBIND_OPTS=( "${CHBIND_OPTS[@]}" --ip "$i" ) done + + _HAVE_CHBIND_OPTIONS=1 } function _generateNiceCommand @@ -98,11 +90,44 @@ function _generateNiceCommand NICE_CMD=( $_NICE -$nice ) } +function _generateCCapabilityOptions +{ + local vdir=$1 + local cap + local f="$vdir"/ccapabilities + + test -e "$f" || return 0 + while read cap; do + case x"$cap" in + (x|x\#) ;; + (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --ccap "$cap" );; + esac + done <"$f" +} + +function _generateBCapabilityOptions +{ + local vdir=$1 + local cap + local f="$vdir"/bcapabilities + + test -e "$f" || return 0 + while read cap; do + case x"$cap" in + (x|x\#) ;; + (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --bcap "$cap" );; + esac + done <"$f" +} + function _generateCapabilityOptions { local vdir=$1 local cap + _generateBCapabilityOptions "$vdir" + _generateCCapabilityOptions "$vdir" + test -e "$vdir"/capabilities || return 0 CAP_OPTS=() @@ -110,13 +135,14 @@ function _generateCapabilityOptions while read cap; do case x"$cap" in - x|x#) ;; - !CAP_SYSCHROOT) + (x|x\#) ;; + (!CAP_SYSCHROOT) CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" ) CAPCHROOT_OPTS=( "${CAPCHROOT_OPTS[@]}" --nochroot ) ;; - *) - CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" );; + (*) + CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" ) + ;; esac done <"$vdir"/capabilities } @@ -127,7 +153,7 @@ function getEnterShell ENTER_SHELL=() - _getFileValue ENTER_SHELL "$vdir"/shell + getFileValue ENTER_SHELL "$vdir"/shell test "$ENTER_SHELL" || { local i @@ -140,12 +166,29 @@ 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 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 +201,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) + (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" ) @@ -174,34 +220,36 @@ function _generateInitOptions INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$runlevel_start" /var/run/utmp ) ;; - xplain) + (xplain) INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; - xminit) + (xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) INITCMD_START_SYNC=( "$_INITSYNC_MINIT_START" "$vdir" ) INITCMD_STOP_SYNC=( "$_INITSYNC_MINIT_STOP" "$vdir" ) + OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; - x) ;; - *) echo "Unknown init-style '$INITSTYLE'; aborting" >&2; + (x) ;; + (*) echo "Unknown init-style '$INITSTYLE'; aborting" >&2; 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" || { @@ -220,18 +268,24 @@ function _generateFlagOptions while read flag; do case x"$flag" in - x|x#) ;; - dummy) ;; - fakeinit) - CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" - --disconnect --flag --fakeinit ) + (x|x\#) ;; + (xnamespace) ;; + (xfakeinit) + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) ;; - *) + (*) + OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag "$flag" ) CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag "$flag" ) ;; esac done <"$vdir"/flags + + isAvoidNamespace "$cfgdir" || { + USE_VNAMESPACE=1 + CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag namespace ) + } } function _generateChcontextOptions @@ -242,9 +296,9 @@ function _generateChcontextOptions local flag { - read ctx <"$vdir"/context - read hostname <"$vdir"/hostname - read domainname <"$vdir"/domainname + read ctx <"$vdir"/context || : + read hostname <"$vdir"/hostname || : + read domainname <"$vdir"/domainname || : } 2>/dev/null test -z "$S_CONTEXT" || ctx=$S_CONTEXT @@ -254,12 +308,16 @@ function _generateChcontextOptions CHCONTEXT_OPTS=( $SILENT_OPT \ "${CHCONTEXT_FLAG_OPTS[@]}" \ - "${CHCONTEXT_INIT_OPTS[@]}" \ "${CAP_OPTS[@]}" \ --secure ${ctx:+--ctx "$ctx"} \ ${hostname:+--hostname "$hostname"} \ ${domainname:+--domainname "$domainname"} ) + + OPTS_VCONTEXT_CREATE=( $SILENT_OPT \ + ${ctx:+--xid "$ctx"} ) + ## put '--secure' at front so that it can be overridden + OPTS_VATTRIBUTE=( --secure "${OPTS_VATTRIBUTE[@]}" ) } function _getInterfaceValue @@ -319,17 +377,21 @@ function _processSingleInterface _getInterfaceValue name '' "$iface" _getInterfaceValue scope '' "$iface" "$iface/.." - test "$ip" || { echo $"Can not read ip for '$iface'"; return 1; } + test "$ip" || { echo $"Can not read ip for '$iface'" >&2; return 1; } - test ! -e "$iface"/only_ip || unset dev + test ! -e "$iface"/only_ip || { + echo $"The 'only_ip' flag for interface '$iface' is deprecated; use 'nodev' instead of" >&2 + unset dev + } + test ! -e "$iface"/nodev || unset dev if test "$dev"; then _transformMask2Prefix prefix "$prefix" "$mask" case "$dev" in - *.*) + (*.*) test -d /proc/net/vlan || { - echo -e $"VLAN device-name used, but vlan subsystem not enabled.\nTry to execute 'modprobe 8021q' before starting the vservers" + echo -e $"VLAN device-name used, but vlan subsystem not enabled.\nTry to execute 'modprobe 8021q' before starting the vservers" >&2 return 1 } test -f /proc/net/vlan || { @@ -358,6 +420,7 @@ function _generateInterfaceOptions _processSingleInterface "$iface" done + _HAVE_INTERFACE_OPTIONS=1 } function enableInterfaces @@ -384,11 +447,13 @@ function enableInterfaces function disableInterfaces { + test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$1" + local i=$INTERFACE_CMDS_IDX declare -a var while test $i -gt 0; do - let --i + let --i || : eval var='( "${INTERFACE_CMDS_'$i'[@]}" )' local type=${var[0]} @@ -423,42 +488,85 @@ function prepareInit function generateOptions { _generateInterfaceOptions "$1" - _generateChbindOptions "$1" + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" _generateNiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" } +function _mountVserverInternal +{ + local fstab="$1" + test -e "$fstab" || return 0 + shift + + "$@" $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$fstab" +} + function mountVserver { local cfgdir=$1 + local ns_opt=$2 local vdir=$1/vdir + local mtab_src + + test -e "$cfgdir"/fstab -o \ + -e "$cfgdir"/fstab.local || return 0 - test -e "$cfgdir"/fstab || return 0 - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab + 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" + + test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \ + $_VNAMESPACE --cleanup + + _mountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}" + _mountVserverInternal "$cfgdir"/fstab.local + + isAvoidNamespace "$cfgdir" || \ + $_SECURE_MOUNT --rbind -n "$vdir" "/" +} + +function _umountVserverInternal +{ + local fstab="$1" + test -e "$fstab" || return 0 + shift + + tac "$fstab" | { + is_ok=1 + while read src dst tmp; do + test "$tmp" || continue + case x"$src" in + (x\#*) continue;; + esac + + + "$@" $_EXEC_CD "$dst" $_UMOUNT -lfn . || is_ok= + done + test "$is_ok" + } } function umountVserver { local cfgdir=$1 local vdir=$1/vdir + local is_ok=1 - is_ok=1 - - test -e "$cfgdir"/fstab || return 0 + isAvoidNamespace "$cfgdir" || return 0 + test -e "$cfgdir"/fstab -o \ + -e "$cfgdir"/fstab.local || return 0 + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" - pushd "$vdir/" >/dev/null - tac "$cfgdir"/fstab | while read src dst tmp; do - test "$tmp" || continue - case x"$src" in - x#*) continue;; - esac - - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_UMOUNT "$dst" || is_ok= - done - popd >/dev/null + pushd "$vdir/" >/dev/null || return 1 + _umountVserverInternal "$cfgdir"/fstab.local || is_ok= + _umountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}" || is_ok= + popd >/dev/null || return 1 test "$is_ok" }