X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=9e92c98c37bd68d0b3b666162a2f0979aba17cfd;hb=ee4ffc22ce762e4fde1ee458cbcd52132667e7d8;hp=7a6fd87dd623a9475e9c18130c1b253e44041991;hpb=e2061f4c1bb400ee9dc80d521b312ec8607375a1;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 7a6fd87..9e92c98 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -24,7 +24,6 @@ declare -a CHBIND_OPTS=() declare -a CAP_OPTS=() declare -a CHCONTEXT_INIT_OPTS=() declare -a CHCONTEXT_FLAG_OPTS=() -declare -a CHCONTEXT_DISCONNECT=() declare -a CHCONTEXT_OPTS=() declare -a CAPCHROOT_OPTS=() declare -a INTERFACES=() @@ -37,7 +36,14 @@ 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 @@ -59,6 +65,8 @@ function _generateChbindOptions local i local bcast= + test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$vdir" + local f=$vdir/interfaces/bcast getFileValue bcast "$f" @@ -67,6 +75,8 @@ function _generateChbindOptions for i in "${INTERFACES[@]}"; do CHBIND_OPTS=( "${CHBIND_OPTS[@]}" --ip "$i" ) done + + _HAVE_CHBIND_OPTIONS=1 } function _generateNiceCommand @@ -80,6 +90,36 @@ 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 @@ -94,10 +134,12 @@ function _generateCapabilityOptions case x"$cap" in x|x#) ;; !CAP_SYSCHROOT) + OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]" --cap "$cap" ) CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" ) CAPCHROOT_OPTS=( "${CAPCHROOT_OPTS[@]}" --nochroot ) ;; *) + OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]" --cap "$cap" ) CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" );; esac done <"$vdir"/capabilities @@ -122,6 +164,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 @@ -144,7 +203,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) @@ -162,8 +221,8 @@ function _generateInitOptions xplain) INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) - CHCONTEXT_INIT_OPTS=( --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + 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" ) ;; @@ -171,10 +230,10 @@ function _generateInitOptions xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) - CHCONTEXT_INIT_OPTS=( --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + 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" ) ;; @@ -208,17 +267,23 @@ function _generateFlagOptions while read flag; do case x"$flag" in x|x#) ;; - dummy) ;; - fakeinit) - CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + 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 @@ -229,9 +294,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 @@ -241,12 +306,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 @@ -306,9 +375,13 @@ 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" @@ -316,7 +389,7 @@ function _processSingleInterface 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 || { @@ -345,6 +418,7 @@ function _generateInterfaceOptions _processSingleInterface "$iface" done + _HAVE_INTERFACE_OPTIONS=1 } function enableInterfaces @@ -371,11 +445,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]} @@ -410,7 +486,7 @@ function prepareInit function generateOptions { _generateInterfaceOptions "$1" - _generateChbindOptions "$1" + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$1" _generateNiceCommand "$1" _generateInitOptions "$1" _generateChcontextOptions "$1" @@ -419,19 +495,28 @@ function generateOptions function mountVserver { local cfgdir=$1 + local ns_opt=$2 local vdir=$1/vdir local mtab_src test -e "$cfgdir"/fstab || return 0 - findObject -r mtab_src "$CONFDIR"/.defaults/init/mtab "$vdir"/apps/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" + + test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \ + $_VNAMESPACE --cleanup + $_CHBIND "${CHBIND_OPTS[@]}" \ $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab + + isAvoidNamespace "$cfgdir" || \ + $_SECURE_MOUNT --rbind -n "$vdir" "/" } function umountVserver @@ -441,7 +526,9 @@ function umountVserver is_ok=1 - test -e "$cfgdir"/fstab || return 0 + isAvoidNamespace "$cfgdir" || return 0 + test -e "$cfgdir"/fstab || return 0 + test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" pushd "$vdir/" >/dev/null tac "$cfgdir"/fstab | while read src dst tmp; do @@ -450,8 +537,8 @@ function umountVserver x#*) continue;; esac - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_SECURE_UMOUNT "$dst" || is_ok= + $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \ + $_UMOUNT -lfn . || is_ok= done popd >/dev/null