X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=80befc07ab6803079c7b07bf1c729ee4ba82c140;hb=c574f33e210c3438945209d685c218c51f74cbaa;hp=d0540ecd7ba3cb62eef3f26ae714c36e7369c838;hpb=66bf8ad2a2c6de9c31b4cd41bf1ea667b89e74cd;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index d0540ec..80befc0 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -43,10 +43,12 @@ 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 @@ -209,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) @@ -228,6 +230,7 @@ function _generateInitOptions INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) _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" ) ;; @@ -237,7 +240,7 @@ function _generateInitOptions INITCMD_STOP=( /sbin/minit-stop ) _IS_FAKEINIT=1 INITCMD_START_SYNC=( "$_INITSYNC_MINIT_START" "$vdir" ) - INITCMD_STOP_SYNC=( "$_INITSYNC_MINIT_STOP" "$vdir" ) + _NEED_VSHELPER_SYNC=1 test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; @@ -252,17 +255,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 "$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 @@ -301,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" @@ -389,6 +411,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 { @@ -401,22 +434,29 @@ 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 || { + ## LEGACY ALERT echo $"The 'only_ip' flag for interface '$iface' is deprecated; use 'nodev' instead of" >&2 unset dev } test ! -e "$iface"/nodev || unset dev + test ! -e "$iface"/down || up= if test "$dev"; then _transformMask2Prefix prefix "$prefix" "$mask" @@ -430,15 +470,27 @@ function _processSingleInterface test -f /proc/net/vlan || { _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 + 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 "$ctx"; then + echo $"Using 'dummy' (indirect) for interface '$dev' requires a fixed context number; dynamic ctx are not supported" >&2 + return 1 + else + test "$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 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 } @@ -446,6 +498,9 @@ function _processSingleInterface function _generateInterfaceOptions { local iface + local ctx + + test ! -e "$1"/context || read ctx <"$1"/context for iface in "$1/interfaces/"*; do test -d "$iface" || continue @@ -461,21 +516,35 @@ 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 @@ -485,6 +554,8 @@ function disableInterfaces local i=$INTERFACE_CMDS_IDX declare -a var + lock "$LOCKDIR"/vserver.interfaces + while test $i -gt 0; do let --i || : @@ -492,14 +563,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 @@ -529,6 +607,7 @@ function generateOptions if test "$_IS_FAKEINIT"; then CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag fakeinit ) OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) fi } @@ -610,24 +689,61 @@ function umountVserver 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 + 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 "$DONT_SKIP_DEFAULTS" || break done }