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=13d8cc378f8a612ac9c65e191d09da5368c4ac89;hpb=e87f9c15708cbe8ed28f1612c242e77a5ef833d5;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 13d8cc3..4f26737 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -63,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' @@ -75,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" @@ -160,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 @@ -187,7 +188,7 @@ function sendKillSequence test -z "$wait" || sleep "$wait" $_VKILL -c "$ctx" ${1:+-s "$1"} 2>/dev/null || : - test "$2" || break + test -n "$2" || break wait="$2" shift 2 done @@ -218,8 +219,8 @@ function _generateInitOptions 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 @@ -265,7 +266,7 @@ function _generateInitOptions getFileArray INITCMD_PREPARE "$cfgdir"/cmd.prepare || : - test "$OPTION_FORCE_SYNC" -o -e "$cfgdir"/sync || { + test -n "$OPTION_FORCE_SYNC" -o -e "$cfgdir"/sync || { INITCMD_START_SYNC=() INITCMD_STOP_SYNC=() _NEED_VSHELPER_SYNC= @@ -320,17 +321,6 @@ function _generateChcontextOptions 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" @@ -356,7 +346,7 @@ function _generateScheduleOptions local f="$vdir"/schedule test -e "$f" || return 0 - local fill_rate interval tokens tokens_min tokens_max cpu_mask + local fill_rate interval tokens tokens_min tokens_max prio_bias { { read fill_rate && \ @@ -364,47 +354,47 @@ function _generateScheduleOptions read tokens && \ read tokens_min && \ read tokens_max && \ - read cpu_mask || cpu_mask= + read prio_bias || prio_bias= } <"$f" } 2>/dev/null - test "$cpu_mask" || { + 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" --cpu_mask "$cpu_mask" ) + --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 } @@ -451,20 +441,21 @@ function _processSingleInterface _getInterfaceValue scope '' "$iface" "$iface/.." _getInterfaceValue mac '' "$iface" - test "$ip" || { echo $"Can not read ip for '$iface'" >&2; return 1; } + 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"/down || up= - test ! -e "$iface"/down || up= - - while test "$dev"; do + while true; do _transformMask2Prefix prefix "$prefix" "$mask" INTERFACES=( "${INTERFACES[@]}" "$ip${prefix:+/$prefix}" ) - test ! -e "$iface"/nodev || break - test ! -e "$iface"/only_ip || { - ## LEGACY ALERT - echo $"The 'only_ip' flag for interface '$iface' is deprecated; use 'nodev' instead of" >&2 - break - } + test ! -e "$iface"/nodev || break + ## LEGACY ALERT + test ! -e "$iface"/only_ip || break case "$dev" in (*.*) @@ -473,7 +464,7 @@ 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" $up } @@ -484,11 +475,11 @@ function _processSingleInterface _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 + 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 "$mac" || _generateMac mac "$(basename $iface)" "$ctx" || return 1 + 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" @@ -555,7 +546,7 @@ function enableInterfaces function disableInterfaces { - test "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$1" + test -n "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$1" local i=$INTERFACE_CMDS_IDX declare -a var @@ -611,7 +602,7 @@ function prepareStop { pushd "$1/vdir" >/dev/null case "$INITSTYLE" in - sysv) + (sysv) export PREVLEVEL=$RUNLEVEL_START # required by Debian's initscripts ;; esac @@ -623,13 +614,13 @@ function prepareStop 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 "$_IS_FAKEINIT"; then + if test -n "$_IS_FAKEINIT"; then CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --initpid --disconnect ) fi @@ -642,7 +633,19 @@ function _mountVserverInternal shift pushd "$vdir" >/dev/null - "$@" $_SECURE_MOUNT -a --chroot --fstab "$fstab" + "$@" $_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 } @@ -654,7 +657,8 @@ function mountVserver local mtab_src test -e "$cfgdir"/fstab -o \ - -e "$cfgdir"/fstab.local || return 0 + -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 @@ -662,13 +666,14 @@ 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 - _mountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}" + _mountVserverInternal "$cfgdir"/fstab _mountVserverInternal "$cfgdir"/fstab.local + _mountVserverInternal "$cfgdir"/fstab.remote $_CHBIND "${CHBIND_OPTS[@]}" isAvoidNamespace "$cfgdir" || \ $_SECURE_MOUNT --rbind -n "$vdir" "/" @@ -680,10 +685,10 @@ function _umountVserverInternal test -e "$fstab" || return 0 shift - tac "$fstab" | { + $_TAC "$fstab" | { is_ok=1 while read src dst tmp; do - test "$tmp" || continue + test -n "$tmp" || continue case x"$src" in (x\#*) continue;; esac @@ -691,7 +696,7 @@ function _umountVserverInternal "$@" $_EXEC_CD "$dst" $_UMOUNT -lfn . || is_ok= done - test "$is_ok" + test -n "$is_ok" } } @@ -704,14 +709,14 @@ function umountVserver isAvoidNamespace "$cfgdir" || return 0 test -e "$cfgdir"/fstab -o \ -e "$cfgdir"/fstab.local || return 0 - test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" + test -n "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir" 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" + test -n "$is_ok" } ## Usage: waitForSync @@ -726,13 +731,13 @@ function waitForSync local cfgdir=$1 local fifo=$2 - if test "$_NEED_VSHELPER_SYNC"; then + 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 "${#INITCMD_STOP_SYNC[@]}" -ne 0; then + elif test -n "${#INITCMD_STOP_SYNC[@]}" -ne 0; then "${INITCMD_STOP_SYNC[@]}" || \ warning $"\ Stop-synchronization for vserver '$VSERVER_NAME' failed. The vserver @@ -769,6 +774,49 @@ function execScriptlets $start "$i" "$flavor" "$name" done - test -z "$already_handled" -o "$DONT_SKIP_DEFAULTS" || break + 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" }