X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=4f2673794f1a5b2c408c64c1d186305af71e2d1f;hb=7bd540af89c36e0fc25d167f6c4893451b3331a3;hp=d666cbccef161f6573f73839dc2a5e12e9e00184;hpb=ab198dcb10b2c6b0e445a59af00dc292207454f3;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index d666cbc..4f26737 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -38,12 +38,22 @@ declare -a ENTER_SHELL=() declare -a OPTS_VCONTEXT_CREATE=() declare -a OPTS_VCONTEXT_MIGRATE=() -declare -a OPTS_VATTRIBUTE=() -USE_VNAMESPACE= +declare -a OPTS_VATTRIBUTE=( --flag fakeinit ) +declare -a OPTS_VSCHED=() + +declare -a STOPCMD_PREPARE=() +declare -a VSERVER_EXTRA_CMDS=() + +VSHELPER_SYNC_TIMEOUT=30 +USE_VNAMESPACE= INTERFACE_CMDS_IDX=0 +RUNLEVEL_START= +RUNLEVEL_STOP= _HAVE_INTERFACE_OPTIONS= _HAVE_CHBIND_OPTIONS= +_NEED_VSHELPER_SYNC= +_IS_FAKEINIT= INITSTYLE=sysv @@ -53,7 +63,7 @@ SILENT_OPT= : ${VSERVER_NAME:=$(basename "$VSERVER_DIR")} -if test -e "$VSERVER_DIR"/noisy -o "$OPTION_VERBOSE"; then +if test -e "$VSERVER_DIR"/noisy -o -n "$OPTION_VERBOSE"; then SILENT_OPT= else SILENT_OPT='--silent' @@ -65,7 +75,7 @@ function _generateChbindOptions local i local bcast= - test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$vdir" + test -n "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$vdir" local f=$vdir/interfaces/bcast getFileValue bcast "$f" @@ -150,12 +160,13 @@ function _generateCapabilityOptions function getEnterShell { local vdir=$1 + local shell_file ENTER_SHELL=() + + getFileValue ENTER_SHELL "$vdir"/shell "$CONFDIR"/.defaults/shell - getFileValue ENTER_SHELL "$vdir"/shell - - test "$ENTER_SHELL" || { + test -n "$ENTER_SHELL" || { local i for i in "/bin/bash -login" "/bin/sh -l" /bin/csh; do set -- $i @@ -176,8 +187,8 @@ function sendKillSequence while isCtxRunning "$ctx"; do test -z "$wait" || sleep "$wait" - $_VKILL -c "$ctx" ${1:+-s "$1"} - test "$2" || break + $_VKILL -c "$ctx" ${1:+-s "$1"} 2>/dev/null || : + test -n "$2" || break wait="$2" shift 2 done @@ -187,8 +198,6 @@ function _generateInitOptions { local vdir=$1 local cfgdir=$vdir/apps/init - local runlevel_start - local runlevel_stop local i f INITCMD_START=() @@ -196,48 +205,53 @@ function _generateInitOptions INITCMD_START_SYNC=() INITCMD_STOP_SYNC=() INITCMD_PREPARE=() + STOPCMD_PREPARE=() INITKILL_SEQ=( 15 5 9 ) 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 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 + test -n "$RUNLEVEL_START" || RUNLEVEL_START=3 + test -n "$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" ) - INITCMD_STOP=( "$i" "$runlevel_stop" ) + INITCMD_START=( "$i" "$RUNLEVEL_START" ) + INITCMD_STOP=( "$i" "$RUNLEVEL_STOP" ) done - INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$runlevel_start" /var/run/utmp ) + INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmp ) ;; (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" ) + _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" ) ;; (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 ) - test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) - test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) + _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) ;; @@ -245,17 +259,24 @@ 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" || { + test -n "$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 +285,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 +301,7 @@ function _generateFlagOptions esac done <"$vdir"/flags - isAvoidNamespace "$cfgdir" || { + isAvoidNamespace "$vdir" || { USE_VNAMESPACE=1 CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag namespace ) } @@ -296,9 +315,10 @@ 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 test -z "$S_CONTEXT" || ctx=$S_CONTEXT @@ -320,33 +340,61 @@ 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 prio_bias + { + { + read fill_rate && \ + read interval && \ + read tokens && \ + read tokens_min && \ + read tokens_max && \ + read prio_bias || prio_bias= + } <"$f" + } 2>/dev/null + + test -n "$prio_bias" || { + 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" --priority-bias "$prio_bias" ) +} + function _getInterfaceValue { - local val=$1 - local dflt=$2 + local _giv_val=$1 + local _giv_dflt=$2 shift 2 - local i - local tmp + local _giv_i + local _giv_tmp - for i; do - read tmp <"$i/$val" && break || : + for _giv_i; do + read _giv_tmp <"$_giv_i/$_giv_val" && break || : done 2>/dev/null - : ${tmp:=$dflt} - eval $val=\$tmp + : ${_giv_tmp:=$_giv_dflt} + eval $_giv_val=\$_giv_tmp } ## Usage: _transformMask2Prefix function _transformMask2Prefix { - local tmp=$2 + local _tm2p_tmp=$2 - test "$tmp" || { - $_MASK2PREFIX "$3" || tmp=$? + test -n "$_tm2p_tmp" || { + $_MASK2PREFIX "$3" || _tm2p_tmp=$? } - eval $1=\$tmp + eval $1=\$_tm2p_tmp return 0 } @@ -356,6 +404,17 @@ function _addInterfaceCmd let ++INTERFACE_CMDS_IDX } +## Usage: _generateMac +function _generateMac +{ + isNumber "$2" || { + echo $"Interface basename '$iface' must be either a number, or the mac must be configured explicitly" >&2 + return 1 + } + + eval $1=$(printf "f0:ff:%02x:%02x:%02x:%02x" $[ (~($2>>8)) & 0xff ] $[ ($2 & 0xff) ] $[ ($3>>8) & 0xff ] $[ $3 & 0xff ]) +} + ## Usage: _processSingleInterface function _processSingleInterface { @@ -368,25 +427,35 @@ function _processSingleInterface local bcast local name local scope + local mac + local extip + local up="up" _getInterfaceValue ip '' "$iface" + _getInterfaceValue extip '' "$iface" "$iface/.." _getInterfaceValue dev '' "$iface" "$iface/.." _getInterfaceValue prefix '' "$iface" "$iface/.." _getInterfaceValue mask '' "$iface" "$iface/.." _getInterfaceValue bcast '' "$iface" "$iface/.." _getInterfaceValue name '' "$iface" _getInterfaceValue scope '' "$iface" "$iface/.." + _getInterfaceValue mac '' "$iface" - test "$ip" || { echo $"Can not read ip for '$iface'" >&2; return 1; } - - test ! -e "$iface"/only_ip || { - echo $"The 'only_ip' flag for interface '$iface' is deprecated; use 'nodev' instead of" >&2 - unset dev + test -n "$ip" || { echo $"Can not read ip for '$iface'" >&2; return 1; } + test -n "$dev" -o -e "$iface"/nodev || { + echo $"No device specified for '$iface'" >&2 + return 1; } - test ! -e "$iface"/nodev || unset dev - - if test "$dev"; then + + test ! -e "$iface"/down || up= + + while true; do _transformMask2Prefix prefix "$prefix" "$mask" + INTERFACES=( "${INTERFACES[@]}" "$ip${prefix:+/$prefix}" ) + + test ! -e "$iface"/nodev || break + ## LEGACY ALERT + test ! -e "$iface"/only_ip || break case "$dev" in (*.*) @@ -395,24 +464,40 @@ function _processSingleInterface return 1 } test -f /proc/net/vlan || { - _addInterfaceCmd VCONFIG "${dev/./ }" + _addInterfaceCmd VCONFIG ${dev/./ } _addInterfaceCmd IP_ADDR 127.0.0.1/8 broadcast 127.255.255.255 dev "$dev" - _addInterfaceCmd IP_LINK "$dev" + _addInterfaceCmd IP_LINK "$dev" $up } ;; esac - INTERFACES=( "${INTERFACES[@]}" "$ip${prefix:+/$prefix}" ) - _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" broadcast ${bcast:-+} ${name:+label "$dev:$name"} dev "$dev" - #_addInterfaceCmd IP_ROUTE "$ip${prefix:+/$prefix}" dev "$dev" - _addInterfaceCmd IP_LINK "$dev" - fi + if ! test -e "$iface"/indirect; then + _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" broadcast ${bcast:-+} ${name:+label "$dev:$name"} dev "$dev" + #_addInterfaceCmd IP_ROUTE "$ip${prefix:+/$prefix}" dev "$dev" + _addInterfaceCmd IP_LINK "$dev" $up + elif ! test -n "$ctx"; then + echo $"Using 'dummy' (indirect) for interface '$dev' requires a fixed context number; dynamic ctx are not supported" >&2 + return 1 + else + test -z "$mac" || _generateMac mac "$(basename $iface)" "$ctx" || return 1 + _addInterfaceCmd MODPROBE dummy "$dev" + _addInterfaceCmd IP_LINK dev dummy0 address "$mac" + _addInterfaceCmd NAMEIF "$dev" "$mac" + _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" dev "$dev" + test -z "$extip" || _addInterfaceCmd IPTABLES "$ip${prefix:+/$prefix}" ${name:+label "$dev:$name"} "$ctx" "$extip" + fi + + break + done } ## Usage: _generateInterfaceOptions function _generateInterfaceOptions { local iface + local ctx + + test ! -e "$1"/context || read ctx <"$1"/context for iface in "$1/interfaces/"*; do test -d "$iface" || continue @@ -428,30 +513,46 @@ function enableInterfaces local i=0 declare -a var + lock "$LOCKDIR"/vserver.interfaces + while test $i -lt $INTERFACE_CMDS_IDX; do eval var='( "${INTERFACE_CMDS_'$i'[@]}" )' local type=${var[0]} unset var[0] - + + set -- "${var[@]}" case "$type" in - VCONFIG) $_VCONFIG add "${var[@]}";; - IP_ADDR) $_IP addr add "${var[@]}";; - IP_LINK) $_IP link set "${var[@]}" up;; - IP_ROUTE) $_IP route add "${var[@]}";; - *) echo "Unknown interface-command type '$type'" >&2; false;; + IPTABLES) ;; ## TODO + MODPROBE) + local mod=$1 + local name=$2 + shift 2 + $_MODPROBE ${name:+-o "$name"} "$mod" "$@" + ;; + NAMEIF) $_NAMEIF "$@";; + VCONFIG) $_VCONFIG add "$@";; + IP_ADDR) $_IP addr add "$@";; + IP_ADDR_FLUSH) $_IP addr flush "$@";; + IP_LINK) $_IP link set "$@";; + IP_ROUTE) $_IP route add "$@";; + *) echo "Unknown interface-command type '$type'" >&2; false;; esac let ++i done + + unlock 1 } function disableInterfaces { - test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$1" + test -n "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$1" local i=$INTERFACE_CMDS_IDX declare -a var + lock "$LOCKDIR"/vserver.interfaces + while test $i -gt 0; do let --i || : @@ -459,14 +560,21 @@ function disableInterfaces local type=${var[0]} unset var[0] + set -- "${var[@]}" case "$type" in - VCONFIG) $_VCONFIG rem "${var[@]}";; - IP_ADDR) $_IP addr del "${var[@]}";; - IP_LINK) ;; ## Ignore the link-down command for now - IP_ROUTE) $_IP route del "${var[@]}";; - *) echo "Unknown interface-command type '$type'" >&2; false;; + IPTABLES) ;; ## TODO + MODPROBE) $_RMMOD "${2:-$1}";; + NAMEIF) ;; + VCONFIG) $_VCONFIG rem "$@";; + IP_ADDR) $_IP addr del "$@";; + IP_ADDR_FLUSH) ;; + IP_LINK) ;; ## Ignore the link-down command for now + IP_ROUTE) $_IP route del "$@";; + *) echo "Unknown interface-command type '$type'" >&2; false;; esac done + + unlock 1 } ## Usage: prepareInit @@ -478,6 +586,10 @@ function prepareInit { find var/run ! -type d -print0; \ find var/lock ! -type d -print0; } | xargs -0r $_CHROOT_RM ;; + plain) + $_CHROOT_RM .autofsck forcefsck 2>/dev/null || : + : | $_CHROOT_CAT fastboot 2>/dev/null || : + ;; minit) ;; esac @@ -485,13 +597,56 @@ function prepareInit popd >/dev/null } +## Usage: prepareInit +function prepareStop +{ + pushd "$1/vdir" >/dev/null + case "$INITSTYLE" in + (sysv) + export PREVLEVEL=$RUNLEVEL_START # required by Debian's initscripts + ;; + esac + "${STOPCMD_PREPARE[@]}" + popd >/dev/null +} + + function generateOptions { _generateInterfaceOptions "$1" - test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" + test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" _generateNiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" + _generateScheduleOptions "$1" + + if test -n "$_IS_FAKEINIT"; then + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --initpid --disconnect ) + fi +} + +function _mountVserverInternal +{ + local fstab="$1" + test -e "$fstab" || return 0 + shift + + pushd "$vdir" >/dev/null + "$@" $_SECURE_MOUNT -a --chroot --fstab "$fstab" --rootfs no + popd >/dev/null +} + +function mountRootFS +{ + local cfgdir=$1 + local vdir=$1/vdir + local fstab="$cfgdir"/fstab + + test -e "$fstab" || return 0 + pushd "$vdir" >/dev/null + $_SECURE_MOUNT -a --chroot --fstab "$fstab" --rootfs only -n + popd >/dev/null } function mountVserver @@ -501,7 +656,9 @@ function mountVserver local vdir=$1/vdir local mtab_src - test -e "$cfgdir"/fstab || return 0 + test -e "$cfgdir"/fstab -o \ + -e "$cfgdir"/fstab.local -o \ + -e "$cfgdir"/fstab.remote || return 0 findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab "$PKGLIBDEFAULTDIR"/mtab /dev/null @@ -509,62 +666,157 @@ function mountVserver $_CHROOT_CAT /etc/mtab <"$mtab_src" popd >/dev/null - test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" + test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \ $_VNAMESPACE --cleanup - - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab + + _mountVserverInternal "$cfgdir"/fstab + _mountVserverInternal "$cfgdir"/fstab.local + _mountVserverInternal "$cfgdir"/fstab.remote $_CHBIND "${CHBIND_OPTS[@]}" 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 -n "$tmp" || continue + case x"$src" in + (x\#*) continue;; + esac + + + "$@" $_EXEC_CD "$dst" $_UMOUNT -lfn . || is_ok= + done + test -n "$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 -n "$_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 + 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 - $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \ - $_UMOUNT -lfn . || is_ok= - done - popd >/dev/null + test -n "$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 -n "$_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 -n "${#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 "$is_ok" + test -z "$OPTION_FORCE_SYNC" -a ! -e "$cfgdir"/sync || + sleep 1 } function _sourceWrap { - local vdir name flavor start i + local vdir name flavor start i already_handled base . "$@" } ## Usage: execScriptlets function execScriptlets { - local vdir=$1 - local name=$2 - local flavor=$3 - local start= - local i + declare -r vdir=$1 + declare -r name=$2 + declare -r flavor=$3 + local base i + + for base in "$vdir"/scripts "$CONFDIR"/.defaults/scripts; do + local DONT_SKIP_DEFAULTS= + local already_handled= + + for i in "$base/$flavor" "$base/$flavor.d"/*; do + test -f "$i" -a -r "$i" || continue + already_handled=1 + local start= + test -x "$i" || start=_sourceWrap + $start "$i" "$flavor" "$name" + done - for i in "$vdir/scripts/$flavor" "$vdir/scripts/$flavor.d"/*; do - test -f "$i" -a -r "$i" || continue - test -x "$i" || start=_sourceWrap - $start "$i" "$flavor" "$name" + test -z "$already_handled" -o -n "$DONT_SKIP_DEFAULTS" || break done } + + +function sanityCheck +{ + declare -r cfgdir=$1 + + ! test -e "$cfgdir"/fstab.local || + warning $"\ +WARNING: 'fstab' will *not* be executed in the network context of the + vserver anymore. Therefore, 'fstab.local' has the same functionality + and is obsoleted. When you need the old behaviour, put the mounts + into 'fstab.remote'" + + ! test -e "$cfgdir"/hostname -a ! -L "$cfgdir"/hostname || + warning $"\ +WARNING: The hostname is now configured in 'uts/nodename' but not in + 'hostname'." + + ! test -e "$cfgdir"/domainname -a ! -L "$cfgdir"/domainname || + warning $"\ +WARNING: The domainname is now configured in 'uts/domainname' but not + in 'domainname'." >&2 + + + local i + for i in "$cfgdir"/interfaces/*/only_ip; do + if test -e "$i"; then + local iface + iface=${i##$cfgdir/interfaces/} + iface=${iface%%/only_ip} + warning $"\ +WARNING: The 'only_ip' flag for interface '$iface' is deprecated; use + 'nodev' instead of" + fi + done + + find "$cfgdir" -type f -exec "$_CHECK_UNIXFILE" '{}' ';' + + vshelper.doSanityCheck + + $_VSERVER_INFO - VERIFYCAP || + panic $"capabilities are not enabled in kernel-setup" +}