X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=ae9bd0540fc53b9b545e2990713c97630a15d7dd;hb=552047c69c293485ce2401ae8bc0c0894b2fb410;hp=88fa86e321ca93605ff8f60876a75b76e515353b;hpb=a4ede64484e17d067947b0c08c2c174be47602c7;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 88fa86e..ae9bd05 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -39,11 +39,17 @@ declare -a ENTER_SHELL=() declare -a OPTS_VCONTEXT_CREATE=() declare -a OPTS_VCONTEXT_MIGRATE=() declare -a OPTS_VATTRIBUTE=() -USE_VNAMESPACE= +declare -a OPTS_VSCHED=() + +declare -a VSERVER_EXTRA_CMDS=() +VSHELPER_SYNC_TIMEOUT=30 +USE_VNAMESPACE= INTERFACE_CMDS_IDX=0 _HAVE_INTERFACE_OPTIONS= _HAVE_CHBIND_OPTIONS= +_NEED_VSHELPER_SYNC= +_IS_FAKEINIT= INITSTYLE=sysv @@ -205,7 +211,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) @@ -223,8 +229,8 @@ function _generateInitOptions (xplain) INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) - CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) - OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) + _IS_FAKEINIT=1 + _NEED_VSHELPER_SYNC=1 test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; @@ -232,30 +238,41 @@ function _generateInitOptions (xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) - CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + _IS_FAKEINIT=1 INITCMD_START_SYNC=( "$_INITSYNC_MINIT_START" "$vdir" ) - INITCMD_STOP_SYNC=( "$_INITSYNC_MINIT_STOP" "$vdir" ) - OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) + _NEED_VSHELPER_SYNC=1 test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; + (xgentoo) + INITCMD_START=( /sbin/rc default ) + INITCMD_STOP=( /sbin/rc shutdown ) + ;; + (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" || { + test "$OPTION_FORCE_SYNC" -o -e "$cfgdir"/sync || { INITCMD_START_SYNC=() INITCMD_STOP_SYNC=() + _NEED_VSHELPER_SYNC= } + + if vshelper.isEnabled; then + vshelper.getSyncTimeout "$vdir" VSHELPER_SYNC_TIMEOUT || : + else + _NEED_VSHELPER_SYNC= + fi } function _generateFlagOptions @@ -264,15 +281,13 @@ function _generateFlagOptions CHCONTEXT_FLAG_OPTS=() - test -e "$vdir"/flags || return 0 - + test ! -e "$vdir"/flags || \ while read flag; do case x"$flag" in (x|x\#) ;; (xnamespace) ;; (xfakeinit) - CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) - OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) + _IS_FAKEINIT=1 ;; (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag "$flag" ) @@ -282,7 +297,7 @@ function _generateFlagOptions esac done <"$vdir"/flags - isAvoidNamespace "$cfgdir" || { + isAvoidNamespace "$vdir" || { USE_VNAMESPACE=1 CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag namespace ) } @@ -296,11 +311,23 @@ function _generateChcontextOptions local flag { - read ctx <"$vdir"/context || : - read hostname <"$vdir"/hostname || : - read domainname <"$vdir"/domainname || : + read ctx <"$vdir"/context || : + ## LEGACY ALERT + read hostname <"$vdir"/uts/nodename || read hostname <"$vdir"/hostname || : + read domainname <"$vdir"/uts/domainname || read domainname <"$vdir"/domainname || : } 2>/dev/null + ## LEGACY ALERT + test \( ! -e "$vdir"/hostname -o -e "$vdir"/uts/nodename \) -a \ + \( ! -e "$vdir"/domainname -o -e "$vdir"/uts/domainname \) || { + echo $"\ +The hostname is now configured in 'uts/nodename' but not in 'hostname' anymore; +the old way is not supported when using 2.6 kernel patches so it is strongly +recommended to move these files. + +The same applies to 'domainname' vs. 'uts/domainname'." >&2 + } + test -z "$S_CONTEXT" || ctx=$S_CONTEXT _generateCapabilityOptions "$vdir" @@ -320,6 +347,34 @@ function _generateChcontextOptions OPTS_VATTRIBUTE=( --secure "${OPTS_VATTRIBUTE[@]}" ) } +function _generateScheduleOptions +{ + local vdir=$1 + local f="$vdir"/schedule + test -e "$f" || return 0 + + local fill_rate interval tokens tokens_min tokens_max cpu_mask + { + { + read fill_rate && \ + read interval && \ + read tokens && \ + read tokens_min && \ + read tokens_max && \ + read cpu_mask || cpu_mask= + } <"$f" + } 2>/dev/null + + test "$cpu_mask" || { + echo $"Bad content in '$f'; aborting..." >&2 + false + } + + OPTS_VSCHED=( --fill-rate "$fill_rate" --interval "$interval" \ + --tokens "$tokens" --tokens_min "$tokens_min" \ + --tokens_max "$tokens_max" --cpu_mask "$cpu_mask" ) +} + function _getInterfaceValue { local val=$1 @@ -492,6 +547,21 @@ function generateOptions _generateNiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" + _generateScheduleOptions "$1" + + if test "$_IS_FAKEINIT"; then + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) + fi +} + +function _mountVserverInternal +{ + local fstab="$1" + test -e "$fstab" || return 0 + shift + + "$@" $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$fstab" } function mountVserver @@ -501,7 +571,8 @@ function mountVserver local vdir=$1/vdir local mtab_src - test -e "$cfgdir"/fstab || return 0 + test -e "$cfgdir"/fstab -o \ + -e "$cfgdir"/fstab.local || return 0 findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab "$PKGLIBDEFAULTDIR"/mtab /dev/null @@ -513,40 +584,83 @@ function mountVserver test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \ $_VNAMESPACE --cleanup - - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab + + _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 - - isAvoidNamespace "$cfgdir" || return 0 - test -e "$cfgdir"/fstab || return 0 - test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" + 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[@]}" $_EXEC_CD "$dst" \ - $_UMOUNT -lfn . || 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" } +## Usage: waitForSync +function initSync +{ + test -z "$_NEED_VSHELPER_SYNC" || vshelper.initSync "$1" "$2" +} + +## Usage: waitForSync [] +function waitForSync +{ + local cfgdir=$1 + local fifo=$2 + + if test "$_NEED_VSHELPER_SYNC"; then + $_VSHELPER_SYNC "$fifo" "$VSHELPER_SYNC_TIMEOUT" || \ + warning $"\ +A timeout or other error occured while waiting for the synchronization +signal from vserver '$VSERVER_NAME'. +The vserver will be killed nevertheless..." + elif test "${#INITCMD_STOP_SYNC[@]}" -ne 0; then + "${INITCMD_STOP_SYNC[@]}" || \ + warning $"\ +Stop-synchronization for vserver '$VSERVER_NAME' failed. The vserver +will be killed nevertheless..." + fi + + test -z "$OPTION_FORCE_SYNC" -a ! -e "$cfgdir"/sync || + sleep 1 +} + function _sourceWrap { local vdir name flavor start i