X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=d666cbccef161f6573f73839dc2a5e12e9e00184;hb=ab198dcb10b2c6b0e445a59af00dc292207454f3;hp=a86303abde71657295fa3f9a5aca79e8f49586de;hpb=720d7e009dd68fd52d1817e3a645566ef9d99a65;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index a86303a..d666cbc 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -36,6 +36,11 @@ 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= @@ -85,11 +90,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 +135,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 } @@ -169,7 +208,7 @@ function _generateInitOptions getFileArray INITKILL_SEQ "$cfgdir"/killseq case x"$INITSTYLE" in - xsysv) + (xsysv) test "$runlevel_start" || runlevel_start=3 test "$runlevel_stop" || runlevel_stop=6 @@ -181,26 +220,28 @@ 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 ) + 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" ) ;; - xminit) + (xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) 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" ) ;; - x) ;; - *) echo "Unknown init-style '$INITSTYLE'; aborting" >&2; + (x) ;; + (*) echo "Unknown init-style '$INITSTYLE'; aborting" >&2; exit 1;; esac @@ -227,16 +268,24 @@ function _generateFlagOptions while read flag; do case x"$flag" in - x|x#) ;; - xfakeinit) + (x|x\#) ;; + (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 @@ -264,6 +313,11 @@ 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 _getInterfaceValue @@ -323,17 +377,21 @@ 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" 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 || { @@ -436,13 +494,6 @@ function generateOptions _generateChcontextOptions "$1" } -function _isAvoidNamespace -{ - test ! -e "$1"/namespace || return 1 - test -e "$CONFDIR"/.defaults/nonamespace -o \ - -e "$1"/nonamespace -} - function mountVserver { local cfgdir=$1 @@ -459,10 +510,14 @@ function mountVserver 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" || \ + isAvoidNamespace "$cfgdir" || \ $_SECURE_MOUNT --rbind -n "$vdir" "/" } @@ -473,7 +528,7 @@ function umountVserver is_ok=1 - _isAvoidNamespace "$cfgdir" || return 0 + isAvoidNamespace "$cfgdir" || return 0 test -e "$cfgdir"/fstab || return 0 test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" @@ -481,7 +536,7 @@ function umountVserver tac "$cfgdir"/fstab | while read src dst tmp; do test "$tmp" || continue case x"$src" in - x#*) continue;; + (x\#*) continue;; esac $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \