_VS_NEWLINE='
'
declare -r _VS_NEWLINE=${_VS_NEWLINE:0-1}
+declare -r VS_ALLVSERVERS_ARGS=all,marked,unmarked,stopped,running
function findObject
{
$_CP -af "$tmp" "$dst"
}
+## Usage: isRegularFile <filename> [<mod>]
+function isRegularFile
+{
+ test ${2:--f} "$1" || return 1
+
+ case $1 in
+ (*.rpmsave|*.rpmnew|*.rpmorig|*.cfsaved*|*.~*~) return 1;;
+ esac
+
+ return 0
+}
+
function getPhysicalDir
{
( set -P && cd "$1" && pwd )
}
+## Usage:: isDirectoryEmpty <dir> [<ignore-lost+found>]
+function isDirectoryEmpty
+{
+ (
+ shopt -s dotglob || *
+ shopt -s nullglob || *
+
+ ignore_lostfound=1
+ test -z "$2" -o "$2" = 0 || ignore_lostfound=
+
+ for i in "$1"/*; do
+ case "$i" in
+ (lost+found)
+ test "$ignore_lostfound" || exit 1
+ ;;
+ (*) echo "$i"; exit 1
+ esac
+ done
+
+ exit 0
+ )
+}
+
## Usage: logging <message>
function logging
{
exit 0
}
+
+## Usage: spawn <message>
+function spawn
+{
+ test -z "${DEBUG_EXEC:-}" || echo "$@"
+ test "${DEBUG_EXEC:-}" = noexec || "$@"
+}
+
## Usage: isNumber <arg>
function isNumber
{
return 0
}
+## Usage: hasSubstring <haystack> <needle>+
+function hasSubstring
+{
+ local pat=$1
+ local i
+
+ shift
+
+ for i; do
+ test x"${pat/*$i*/$i}" = x"$i" || continue
+ return 0
+ done
+
+ return 1
+}
+
## Usage: colorize <style> <command>
function colorize
{
"$@"
else
local cfile
- findFile cfile "$CONFDIR"/.defaults/styles/"$style" ''
+ findFile cfile "$__CONFDIR"/.defaults/styles/"$style" ''
if test -n "$cfile"; then
$_CAT "$cfile"
else
esac
fi
- "$@"
+ ( "$@" )
echo -ne "\e[m"
fi
}
+function colpanic
+{
+ if test -n "$_VS_ERRFILE"; then
+ echo "$@" >>"$_VS_ERRFILE"
+ else
+ colorize echo -n "$@" >&2
+ fi
+ echo
+
+ exit 1
+}
+
+function colwarning
+{
+ colorize warning warning "$@"
+}
+
+function colinfo
+{
+ colorize info echo "$@"
+}
+
+
## Usage: xtermTitle <title>
function xtermTitle
{
fi
;;
*)
- BASEDIR=$CONFDIR/$vserver
+ BASEDIR=$__CONFDIR/$vserver
test -d "$BASEDIR" || {
echo "Can not find configuration-directory"
exit 1
} >&2
VDIR=$BASEDIR/vdir
- test -d "$VDIR" || VDIR=$DEFAULT_VSERVERDIR/$vserver
+ test -d "$VDIR" || VDIR=$__DEFAULT_VSERVERDIR/$vserver
VDIR=$(getPhysicalDir "$VDIR")
PKGDIR=$BASEDIR/apps/pkgmgmt
$_VSERVER_INFO - FEATURE namespace || return 0
cfgdir=$($_VSERVER_INFO "$1" CFGDIR) || return 0
test ! -e "$cfgdir"/namespace || return 1
- test -e "$CONFDIR"/.defaults/nonamespace -o \
+ test -e "$__CONFDIR"/.defaults/nonamespace -o \
-e "$cfgdir"/nonamespace
}
+## Usage: getAllVservers <var> [<KIND>*]
function getAllVservers
{
local _ga_i
declare -a _ga_tmp=()
- for _ga_i in $CONFDIR/*; do
- test -d "$_ga_i" || continue
+ for _ga_i in $__CONFDIR/*; do
+ isRegularFile "$_ga_i" -d || continue
+
test ! -e "$_ga_i"/disabled || continue
test -d "$_ga_i"/vdir || continue
- case "$_ga_i" in
- *.~*~) continue;;
+
+ local _ga_doadd=1
+ local _ga_markfile=$_ga_i/apps/init/mark
+
+ case ${2:-ALL} in
+ (MARKED) test -s "$_ga_markfile" || _ga_doadd=;;
+ (UNMARKED) test ! -s "$_ga_markfile" || _ga_doadd=;;
+ (STOPPED) ! $_VSERVER "$_ga_i" running &>/dev/null || _ga_doadd=;;
+ (RUNNING) $_VSERVER "$_ga_i" running &>/dev/null || _ga_doadd=;;
+ (ALL) ;;
+ (*) panic $"Unknown vserver tagging '$2'";;
esac
- _ga_tmp=( "${_ga_tmp[@]}" "${_ga_i##$CONFDIR/}")
+ test -z "$_ga_doadd" || _ga_tmp=( "${_ga_tmp[@]}" "${_ga_i##$__CONFDIR/}")
done
eval $1='( "${_ga_tmp[@]}" )'
}
+## Usage: getAllVserversByArg <var> <arg>
+function getAllVserversByArg
+{
+ local _gav_mark=
+
+ case $2 in
+ (--all) _gav_mark=ALL;;
+ (--marked) _gav_mark=MARKED;;
+ (--unmarked) _gav_mark=UNMARKED;;
+ (--stopped) _gav_mark=STOPPED;;
+ (--running) _gav_mark=RUNNING;;
+ (*) return 1;;
+ esac
+
+ getAllVservers "$1" "$_gav_mark"
+}
+
## Usage: _getProcNumberCount <ctx> <var>
function _getProcNumberCount
{
case "$i" in
(core) test -x "$_CHBIND" || failed=1;;
(build) test -x "$_VSERVER_BUILD" || failed=1;;
- (sysv) test -x "$INITRDDIR/vserver" || failed=1;;
- (devel) test -d "$INCLUDEDIR/vserver.h" || failed=1;;
+ (sysv) test -x "$__INITRDDIR/vserver" || failed=1;;
+ (devel) test -d "$__INCLUDEDIR/vserver.h" || failed=1;;
(*) echo "Unknown component '$i'" >&2
return false
;;
## Usage: isKernelAPI <ver> [<cmp-modifier>]
function isKernelAPI
{
- local api=$($_VSERVER_INFO - APIVER) || api=0
+ local api
+ api=$($_VSERVER_INFO - APIVER) || api=0
test $[ $api ] -${2:-ge} $[ $1 ]
}
cfgdir=$($_VSERVER_INFO "$1" APPDIR init) || cfgdir=
findObject -e ttyname \
${cfgdir:+"$cfgdir"/tty} \
- "$CONFDIR/.defaults/apps/init/tty" \
+ "$__CONFDIR/.defaults/apps/init/tty" \
$2 /dev/null
exec <$ttyname
exec &>$ttyname
}
+## Usage: killContext <XID> [<SIG>]
+function killContext
+{
+ local sig=${2:-9}
+
+ #$_VKILL -s STOP --xid "$1" 1 &>/dev/null || :
+ $_VKILL -s "$sig" --xid "$1" 1 &>/dev/null || :
+ $_VKILL -s "$sig" --xid "$1" &>/dev/null || :
+ #$_VKILL -s "$sig" --xid "$1" 1 &>/dev/null || :
+ #$_VKILL -s CONT --xid "$1" 1 &>/dev/null || :
+}
+
## Usage: pkgmgmt.guessStyle <vserver> <resultvar>
function pkgmgmt.guessStyle()
{
- local _pgs_vdir=$($_VSERVER_INFO "$1" VDIR) || {
+ local _pgs_vdir
+ _pgs_vdir=$($_VSERVER_INFO "$1" VDIR) || {
echo $"Can not determine vserver-root" >&2
return 1
}
if ! test -r "$proc_file"; then
vshelper=
warnings=( "${warnings[@]}"
- $"File '$proc_file' does not exists but is required for vshelper setup" )
+ $"File '$proc_file' does not exist but is required for vshelper setup" )
solution_disable=1
else
vshelper=$(cat "$proc_file")
}
fi
- test -d "$VSHELPERSTATEDIR" || {
+ test -d "$__VSHELPERSTATEDIR" || {
warnings=( "${warnings[@]}"
$"\
-The vshelper state-directory '$VSHELPERSTATEDIR' does not exist; since
+The vshelper state-directory '$__VSHELPERSTATEDIR' does not exist; since
it is created by 'make install', this indicates a serious problem with
your util-vserver installation" )
solution_disable=1
test -z "$solution_disable" || warning $"\
* disable vshelper entirely by executing
- | touch \"$CONFDIR/.defaults/apps/vshelper/disabled\"
+ | touch \"$__CONFDIR/.defaults/apps/vshelper/disabled\"
* disable only this message by executing
- | touch \"$CONFDIR/.defaults/apps/vshelper/warning-disabled\""
+ | touch \"$__CONFDIR/.defaults/apps/vshelper/warning-disabled\""
test -x "$solution_sysctl" || warning $"\
* configure the util-vserver vshelper script, e.g. by adding
- | kernel.vshelper = \"$_VSHELPER\"
+ | kernel.vshelper = $_VSHELPER
to /etc/sysctl.conf and rebooting the machine, or by executing
| echo \"$_VSHELPER\" >$proc_file"
function vshelper.isEnabled
{
local f=${1:+$1-}disabled
- test ! -e "$CONFDIR"/.defaults/apps/vshelper/"$f" || return 1
+ test ! -e "$__CONFDIR"/.defaults/apps/vshelper/"$f" || return 1
$_VSERVER_INFO - FEATURE vshelper || return 1
if test -n "$2"; then
- local appdir=$($_VSERVER_INFO "$2" APPDIR vshelper) || return 0
+ local appdir
+ appdir=$($_VSERVER_INFO "$2" APPDIR vshelper) || return 0
test -z "$2" -o ! -e "$appdir/$f" || return 1
fi
return 0
}
+## Usage: vshelper.isDebug [<vserver>]
+function vshelper.isDebug
+{
+ test ! -e "$__CONFDIR"/.defaults/apps/vshelper/debug || return 0
+ $_VSERVER_INFO - FEATURE vshelper || return 1
+ if test -n "$1"; then
+ local appdir
+ appdir=$($_VSERVER_INFO "$1" APPDIR vshelper) || return 1
+ test ! -e "$appdir/debug" || return 0
+ fi
+
+ return 1
+}
+
function vshelper._getHandlerInternal
{
local _vghi_var=$1
## Usage: vshelper.getHandler <result-var> <vserver> <action>
function vshelper.getHandler
{
- local _vgh_appdir=$($_VSERVER_INFO "$2" APPDIR vshelper) || _vgh_appdir=
+ local _vgh_appdir
+ _vgh_appdir=$($_VSERVER_INFO "$2" APPDIR vshelper) || _vgh_appdir=
+
declare -a _vgh_search_list=( X )
## HACK: when we are in 'set -u' mode, empty lists are causing errors
test -z "$_vgh_appdir" || _vgh_search_list=( "${_vgh_search_list[@]}" -x "$_vgh_appdir/$3" )
test -z "$_vgh_appdir" || _vgh_search_list=( "${_vgh_search_list[@]}" -e "$_vgh_appdir/action" )
- _vgh_search_list=( "${_vgh_search_list[@]}" -x "$CONFDIR"/.defaults/apps/vshelper/"$3" )
- _vgh_search_list=( "${_vgh_search_list[@]}" -e "$CONFDIR"/.defaults/apps/vshelper/action )
+ _vgh_search_list=( "${_vgh_search_list[@]}" -x "$__CONFDIR"/.defaults/apps/vshelper/"$3" )
+ _vgh_search_list=( "${_vgh_search_list[@]}" -e "$__CONFDIR"/.defaults/apps/vshelper/action )
! vshelper._getHandlerInternal "$1" "${_vgh_search_list[@]}" || return 0
eval $1=':restart'
{
vshelper.isEnabled || return 0
- local xid=$($_VSERVER_INFO "$1" CONTEXT false) && test -n "$xid" || {
+ local xid
+ xid=$($_VSERVER_INFO "$1" CONTEXT false) && test -n "$xid" || {
warning $"vshelper.init: can not determine xid of vserver '$vserver'; returned value was '$xid'"
return 1
}
- local f="$VSHELPERSTATEDIR/$xid"
+ local f="$__VSHELPERSTATEDIR/$xid"
set -C
$_RM -f "$f"
{
vshelper.isEnabled || return 0
- $_RM -f "$VSHELPERSTATEDIR/$2"
+ $_RM -f "$__VSHELPERSTATEDIR/$2"
}
-## Usage: vshelper.initSync <vserver> <pipe-varname>
+## Usage: vshelper.initSync <vserver> <pipe-varname> [<method>]
function vshelper.initSync
{
- local _vis_tmpdir=$($_MKTEMPDIR /tmp/vserver-stop.XXXXXX) || {
+ local _vis_tmpdir
+ _vis_tmpdir=$($_MKTEMPDIR /tmp/vserver-stop.XXXXXX) || {
warning $"Failed to generate temporary directory for vshelper sync"
return 1
}
local _vis_fifo="$_vis_tmpdir"/pipe
$_MKFIFO -m700 "$_vis_fifo"
- vshelper.doInit "$1" sync "$_vis_fifo"
+ vshelper.doInit "$1" "${3:-sync}" "$_vis_fifo"
eval $2=\$_vis_fifo
}
## Usage: vshelper.getSyncTimeout <vserver> <varname>
function vshelper.getSyncTimeout
{
- local _vgst_appdir=$($_VSERVER_INFO "$1" APPDIR vshelper) || _vgst_appdir=
- local _vgst_file _vgst_tmp
+ local _vgst_appdir _vgst_file _vgst_tmp
+ _vgst_appdir=$($_VSERVER_INFO "$1" APPDIR vshelper) || _vgst_appdir=
- findFile _vgst_file ${_vgst_appdir:+"$_vgst_appdir"/sync-timeout} "$CONFDIR"/.defaults/apps/vshelper/sync-timeout ''
+ findFile _vgst_file ${_vgst_appdir:+"$_vgst_appdir"/sync-timeout} "$__CONFDIR"/.defaults/apps/vshelper/sync-timeout ''
test -n "$_vgst_file" || return 1
read _vgst_tmp <"$_vgst_file"
eval $2=\$_vgst_tmp