shift 2
for _fo_i; do
- test "$_fo_i" || continue
+ test -n "$_fo_i" || continue
test ! $_fo_mod "$_fo_i" || { _fo_file=$_fo_i; break; }
done
- test -z "$_fo_i" -o "$_fo_file" || {
+ test -z "$_fo_i" -o -n "$_fo_file" || {
echo "Can not find file for '$_fo_var'; aborting"
exit 1
} >&2
shift
findFile tmp "$@"
- test "$tmp" -a -s "$tmp" || return 0
+ test -n "$tmp" -a -s "$tmp" || return 0
$_CP -af "$tmp" "$dst"
}
## Usage: logging <message>
function logging
{
- if test "$_VS_LOGFILE"; then
+ if test -n "$_VS_LOGFILE"; then
echo "$@" >>"$_VS_LOGFILE"
else
echo "$@"
## Usage: warning <message>
function warning
{
- if test "$_VS_ERRFILE"; then
+ if test -n "$_VS_ERRFILE"; then
echo "$@" >>"$_VS_ERRFILE"
else
echo "$@" >&2
## Usage: panic <message>
function panic
{
- if test "$_VS_ERRFILE"; then
+ if test -n "$_VS_ERRFILE"; then
echo "$@" >>"$_VS_ERRFILE"
else
echo "$@" >&2
function isNumber
{
local tmp
- let tmp=$1+0 2>/dev/null || test -z "${1//0/}" -a "$1" || return 1
+ let tmp=$1+0 2>/dev/null || test -z "${1//0/}" -a -n "$1" || return 1
return 0
}
"$@"
else
local cfile
- findFile cfile "$CONFDIR"/.defaults/styles/"$style" ''
- if test "$cfile"; then
+ findFile cfile "$__CONFDIR"/.defaults/styles/"$style" ''
+ if test -n "$cfile"; then
$_CAT "$cfile"
else
case "$style" in
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
function _pkgSetVarsRPM
{
- if test "$PKGDIR"; then
+ if test -n "$PKGDIR"; then
findDir RPMETCDIR $PKGDIR/rpmetc $PKGDIR/base/rpm/etc /etc/rpm
findDir RPMSTATEDIR $PKGDIR/rpmstate $PKGDIR/base/rpm/state
function _pkgSetVarsApt
{
- if test "$PKGDIR"; then
+ if test -n "$PKGDIR"; then
findDir APTETCDIR $PKGDIR/aptetc $PKGDIR/base/apt/etc /etc/apt
findDir APTSTATEDIR $PKGDIR/aptstate $PKGDIR/base/apt/state
findDir APTCACHEDIR $PKGDIR/aptcache $PKGDIR/base/apt/cache
test -z "$APT_CONFIG" || export APT_CONFIG
}
+function _pkgSetVarsYum
+{
+ if test -n "$PKGDIR"; then
+ findDir YUMETCDIR $PKGDIR/yumetc $PKGDIR/base/yum/etc /etc
+ findDir YUMCACHEDIR $PKGDIR/yumcache $PKGDIR/base/yum/cache
+ else
+ findDir YUMETCDIR "$VDIR"/etc /etc
+ findDir YUMCACHEDIR "$VDIR"/var/cache/yum
+ fi
+}
+
+
function _pkgMountBase
{
:
:
}
+function _pkgMountYum
+{
+ :
+}
+
function _pkgMountRPM
{
_pkgMountBindDir "$RPMETCDIR" /etc/rpm
function _pkgSetEnvBase
{
- test "$EXECDIR" = "/" || {
+ test "$EXECDIR" = "/" || {
PATH=$EXECDIR:$PATH
LD_LIBRARY_PATH=$EXECDIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
}
:
}
+function _pkgSetEnvYum
+{
+ :
+}
+
function _pkgSetEnvRPM
{
CUR_VSERVER=$vserver
case "$i" in
rpm) _pkgSetVarsRPM;;
apt) _pkgSetVarsApt;;
+ yum) _pkgSetVarsYum;;
*) echo "Unknown packaging flavor" >&2; exit 1;;
esac
done
case "$i" in
rpm) _pkgMountRPM;;
apt) _pkgMountApt;;
+ yum) _pkgMountYum;;
esac
done
case "$i" in
rpm) _pkgSetEnvRPM;;
apt) _pkgSetEnvApt;;
+ yum) _pkgSetEnvYum;;
esac
done
$_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
}
local _ga_i
declare -a _ga_tmp=()
- for _ga_i in $CONFDIR/*; do
+ for _ga_i in $__CONFDIR/*; do
test -d "$_ga_i" || continue
test ! -e "$_ga_i"/disabled || continue
test -d "$_ga_i"/vdir || continue
*.~*~) continue;;
esac
- _ga_tmp=( "${_ga_tmp[@]}" "${_ga_i##$CONFDIR/}")
+ _ga_tmp=( "${_ga_tmp[@]}" "${_ga_i##$__CONFDIR/}")
done
eval $1='( "${_ga_tmp[@]}" )'
read _gvs_ctx <"$1"/run
eval "$2"=\$_gvs_ctx
- test "$3" || return 0
+ test -n "$3" || return 0
local _gvs_tmp
_getProcNumberCount "$_gvs_ctx" _gvs_tmp
eval "$3"=\$_gvs_tmp
local _ivr_ctx _ivr_procnum
getVserverStatus "$1" _ivr_ctx _ivr_procnum 1 || return 1
- test $_ivr_procnum != 0 || return 1
+ test "$_ivr_procnum" != 0 || return 1
test -z "$2" || eval "$2"=\$_ivr_ctx
return 0
}
shift
findFile _gfv_file "$@" ''
- test "$_gfv_file" -a -r "$_gfv_file" || return 0
+ test -n "$_gfv_file" -a -r "$_gfv_file" || return 0
eval read "$_gfv_var" <"$_gfv_file"
}
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 ]
}
ctx=$( $_VSERVER_INFO "$1" CONTEXT f ) || ctx=
shift
- if test "$ctx"; then
+ if test -n "$ctx"; then
$_VNAMESPACE --enter "$ctx" -- "$@"
else
"$@"
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
## 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
}
local _pgs_cfgdir=$($_VSERVER_INFO "$1" APPDIR pkgmgmt) || :
- if test "$_pgs_cfgdir" -a -e "$_pgs_cfgdir"/style; then
+ if test -n "$_pgs_cfgdir" -a -e "$_pgs_cfgdir"/style; then
read style <"$_pgs_cfgdir"/style
elif test -e "$_pgs_vdir"/etc/redhat-release -o -e "$_pgs_vdir"/etc/fedora-release; then
style=redhat
local is_internal="$3"
local have_apt i
- if test "$is_internal"; then
+ if test -n "$is_internal"; then
have_apt=1
test -d "$cfgdir"/base/apt -o -d "$cfgdir"/aptetc || have_apt=
else
done
fi
- test "$have_apt" && return 0 || return 1
+ test -n "$have_apt" && return 0 || return 1
}
+## Usage: pkgmgmt.isYumAvailable <cfgdir> <vdir> [<is-internal>]
+function pkgmgmt.isYumAvailable
+{
+ local cfgdir="$1"
+ local vdir="$2"
+ local is_internal="$3"
+
+ local have_yum i
+ if test -n "$is_internal"; then
+ have_yum=1
+ test -d "$cfgdir"/base/yum -o -d "$cfgdir"/yumetc || have_yum=
+ else
+ have_yum=
+ for i in /bin /usr/bin /usr/local/bin; do
+ test ! -x "$vdir$i"/yum || { have_yum=1; break; }
+ done
+ fi
+
+ test -n "$have_yum" && return 0 || return 1
+}
+
+
function vshelper.doSanityCheck
{
local vshelper this_xid i
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
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 "$2"; then
- local appdir=$($_VSERVER_INFO "$2" APPDIR vshelper) || return 0
+ if test -n "$2"; then
+ 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 1
+ $_VSERVER_INFO - FEATURE vshelper || return 1
+ if test -n "$1"; then
+ local appdir
+ appdir=$($_VSERVER_INFO "$1" APPDIR vshelper) || return 1
+ test -z "$1" -o ! -e "$appdir/debug" || return 1
+ fi
+
+ return 0
+}
+
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 "$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"
echo "$1" >"$f"
set +C
- if test "$2"; then
+ if test -n "$2"; then
shift 1
local i
for i; do
{
vshelper.isEnabled || return 0
- $_RM -f "$VSHELPERSTATEDIR/$2"
+ $_RM -f "$__VSHELPERSTATEDIR/$2"
}
## Usage: vshelper.initSync <vserver> <pipe-varname>
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
}
## 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 ''
- test "$_vgst_file" || return 1
+ 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
}
+
+
+function _rpmFake.getCapFlags
+{
+ local ctx=$1
+
+ if test -n "$ctx" && ! $_VSERVER_INFO - FEATURE migrate; then
+ set -- $($_CHCONTEXT_COMPAT --xid 1 \
+ $_SH -c "$_CAT /proc/[0-9]*/status | $_EGREP '^(CapBset|s_context|ctxflags)'" | \
+ $_GREP -B 1 -A 1 "^s_context: $ctx " | \
+ $_SED -e '1,3p;d' | $_AWK '{ print $2 }')
+ else
+ set --
+ fi
+
+ if test -n "$3"; then
+ RPM_FAKE_CAP=$[ ~0x$1 ]
+ RPM_FAKE_FLAGS=$3
+ else
+ RPM_FAKE_CAP=$[ ~0xd40c04ff ]
+ RPM_FAKE_FLAGS=4
+ fi
+}
+
+function rpmFake.init
+{
+ local vdir ctx
+
+ vdir=$($_VSERVER_INFO "$1" VDIR) || vdir="$1"
+ ctx=$($_VSERVER_INFO "$1" CONTEXT) || ctx=
+
+ test -d "$vdir" ||
+ panic $"Can not find chroot environment at '$vdir' for '$1'"
+
+ _rpmFake.getCapFlags "$ctx"
+
+ RPM_FAKE_CHROOT=$vdir
+ RPM_FAKE_CTX=$ctx
+}
+
+function rpmFake.exec
+{
+ export RPM_FAKE_CHROOT RPM_FAKE_CTX RPM_FAKE_CAP RPM_FAKE_FLAGS
+
+ LD_PRELOAD=$_RPM_FAKE_SO${LD_PRELOAD:+:$LD_PRELOAD} \
+ exec "$@"
+}