X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=c1c9c70edded2b1cd90cd1dd8ee1108497a4d539;hb=95cf3519da76f335389cd7a18d0090b59f81f2e7;hp=deed894fea40be15c82e470580444f3504fce9de;hpb=4fbda6a580ea77c11a507c1c45f1bceed3653722;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index deed894..c1c9c70 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -36,9 +36,20 @@ 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=() +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 @@ -85,11 +96,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=() @@ -97,13 +141,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,6 +172,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 @@ -149,10 +211,10 @@ 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) + (xsysv) test "$runlevel_start" || runlevel_start=3 test "$runlevel_stop" || runlevel_stop=6 @@ -164,40 +226,53 @@ 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 ) + _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) + (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" ) + _NEED_VSHELPER_SYNC=1 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; + (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 @@ -206,21 +281,26 @@ 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#) ;; - dummy) ;; - fakeinit) - CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + (x|x\#) ;; + (xnamespace) ;; + (xfakeinit) + _IS_FAKEINIT=1 ;; - *) + (*) + OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag "$flag" ) CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag "$flag" ) ;; esac done <"$vdir"/flags + + isAvoidNamespace "$vdir" || { + USE_VNAMESPACE=1 + CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag namespace ) + } } function _generateChcontextOptions @@ -231,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" @@ -248,6 +340,39 @@ function _generateChcontextOptions ${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 _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 @@ -286,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 { @@ -298,47 +434,76 @@ 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'"; return 1; } - - test ! -e "$iface"/only_ip || unset dev + 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"/down || up= - if test "$dev"; then + while test "$dev"; do _transformMask2Prefix prefix "$prefix" "$mask" + INTERFACES=( "${INTERFACES[@]}" "$ip${prefix:+/$prefix}" ) + + test ! -e "$iface"/nodev || break 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 || { _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 "$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 + + 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 @@ -354,21 +519,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 @@ -378,6 +557,8 @@ function disableInterfaces local i=$INTERFACE_CMDS_IDX declare -a var + lock "$LOCKDIR"/vserver.interfaces + while test $i -gt 0; do let --i || : @@ -385,14 +566,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 @@ -418,70 +606,147 @@ function generateOptions _generateNiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" + _generateScheduleOptions "$1" + + 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 +} + +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 || 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 /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 + + 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 - 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 + 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 }