LEGACY BREAKAGE FOR 3RD PARTY PATCHES: introduced a more common naming
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 25 Feb 2005 21:37:36 +0000 (21:37 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 25 Feb 2005 21:37:36 +0000 (21:37 +0000)
scheme: global, immutable variables names are now named like '$__ABC'
instead of '$ABC'. This happens at much places and will break a lot of
patches therefore.

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1869 94cd875c-1c1d-0410-91d2-eb244daf1a30

32 files changed:
util-vserver/distrib/redhat/initpost
util-vserver/scripts/functions
util-vserver/scripts/legacy/distrib-info
util-vserver/scripts/legacy/rootshell
util-vserver/scripts/legacy/vserver
util-vserver/scripts/pkgmgmt
util-vserver/scripts/start-vservers
util-vserver/scripts/util-vserver-vars.pathsubst
util-vserver/scripts/vprocunhide
util-vserver/scripts/vpstree
util-vserver/scripts/vserver
util-vserver/scripts/vserver-build
util-vserver/scripts/vserver-build.apt-rpm
util-vserver/scripts/vserver-build.debootstrap
util-vserver/scripts/vserver-build.functions
util-vserver/scripts/vserver-build.functions.apt
util-vserver/scripts/vserver-build.functions.pkgmgmt
util-vserver/scripts/vserver-build.functions.rpm
util-vserver/scripts/vserver-build.functions.yum
util-vserver/scripts/vserver-build.rpm
util-vserver/scripts/vserver-build.yum
util-vserver/scripts/vserver-copy
util-vserver/scripts/vserver-setup.functions
util-vserver/scripts/vserver.functions
util-vserver/scripts/vserver.start
util-vserver/scripts/vserver.stop
util-vserver/scripts/vservers.grabinfo.sh
util-vserver/scripts/vshelper
util-vserver/scripts/vsysvwrapper
util-vserver/scripts/vtop
util-vserver/sysv/rebootmgr
util-vserver/sysv/vservers-legacy

index 06ad9fe..0f1fee3 100755 (executable)
@@ -67,7 +67,7 @@ popd >/dev/null
 pushd "$vdir" &>/dev/null
     : | $_CHROOT_CAT /etc/sysctl.conf
     echo "none    /       none    defaults" | $_CHROOT_CAT /etc/fstab
-    cat "$DISTRIBDIR"/redhat/rc.sysinit     | $_CHROOT_CAT /etc/rc.d/rc.sysinit.vserver
+    cat "$__DISTRIBDIR"/redhat/rc.sysinit   | $_CHROOT_CAT /etc/rc.d/rc.sysinit.vserver
     # TODO: remove race/symlink-attack
     chmod +x etc/rc.d/rc.sysinit.vserver
     subst etc/inittab 's!^\([^#].*:respawn:.* tty\)!#\1!;
index e0a1f3f..e9123f8 100644 (file)
@@ -129,7 +129,7 @@ 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
@@ -212,14 +212,14 @@ function _pkgSetVarsBase
            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
@@ -393,7 +393,7 @@ function isAvoidNamespace
     $_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
 }
 
@@ -402,7 +402,7 @@ function getAllVservers
     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
@@ -410,7 +410,7 @@ function getAllVservers
            *.~*~) continue;;
        esac
 
-       _ga_tmp=( "${_ga_tmp[@]}" "${_ga_i##$CONFDIR/}")
+       _ga_tmp=( "${_ga_tmp[@]}" "${_ga_i##$__CONFDIR/}")
     done
 
     eval $1='( "${_ga_tmp[@]}" )'
@@ -511,8 +511,8 @@ function checkComponents
        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
                        ;;
@@ -559,7 +559,7 @@ function setDefaultTTY
     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
@@ -685,10 +685,10 @@ function vshelper.doSanityCheck
        }
     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
@@ -709,9 +709,9 @@ To fix this, you can:"
 
        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
@@ -731,7 +731,7 @@ To fix this, you can:"
 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
@@ -745,7 +745,7 @@ function vshelper.isEnabled
 ## Usage: vshelper.isDebug [<vserver>]
 function vshelper.isDebug
 {
-    test ! -e "$CONFDIR"/.defaults/apps/vshelper/debug     || return 1
+    test ! -e "$__CONFDIR"/.defaults/apps/vshelper/debug           || return 1
     $_VSERVER_INFO - FEATURE vshelper                       || return 1
     if test -n "$1"; then
        local appdir
@@ -796,8 +796,8 @@ function vshelper.getHandler
 
     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'
@@ -814,7 +814,7 @@ function vshelper.doInit
        return 1
     }
 
-    local f="$VSHELPERSTATEDIR/$xid"
+    local f="$__VSHELPERSTATEDIR/$xid"
     
     set -C
     $_RM -f "$f"
@@ -839,7 +839,7 @@ function vshelper.doDestroy
 {
     vshelper.isEnabled || return 0
 
-    $_RM -f "$VSHELPERSTATEDIR/$2"
+    $_RM -f "$__VSHELPERSTATEDIR/$2"
 }
 
 ## Usage: vshelper.initSync <vserver> <pipe-varname>
@@ -863,7 +863,7 @@ function vshelper.getSyncTimeout
     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
index 771d107..cc5b936 100755 (executable)
@@ -45,10 +45,10 @@ if [ "$1" = "/" ] ; then
        CHROOTCMD=
 elif [ -d "$1" ] ; then
        DISTDIR=$1
-       CHROOTCMD="$SBINDIR/chroot $DISTDIR"
+       CHROOTCMD="$__SBINDIR/chroot $DISTDIR"
 else
-       DISTDIR=$DEFAULT_VSERVERDIR/$1
-       CHROOTCMD="$SBINDIR/chroot $DISTDIR"
+       DISTDIR=$__DEFAULT_VSERVERDIR/$1
+       CHROOTCMD="$__SBINDIR/chroot $DISTDIR"
 fi
 KEY=$2
 shift
index 5eae0bf..d0b63cc 100755 (executable)
@@ -24,5 +24,5 @@ test -e "$UTIL_VSERVER_VARS" || {
 . "$UTIL_VSERVER_VARS"
 
 test "$*" || set -- --login
-exec $SBINDIR/chbind --silent --ip 0.0.0.0 /bin/bash "$@"
+exec $CHBIND --silent --ip 0.0.0.0 /bin/bash "$@"
 
index 7c72d04..fe93fef 100755 (executable)
@@ -26,8 +26,8 @@ test -e "$UTIL_VSERVER_VARS" || {
 }
 . "$UTIL_VSERVER_VARS"
 
-USR_SBIN=$SBINDIR
-USR_LIB_VSERVER=$PKGLIBDIR
+USR_SBIN=$__SBINDIR
+USR_LIB_VSERVER=$__PKGLIBDIR
 DEFAULTPATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
 
 vserver_mknod(){
@@ -54,14 +54,14 @@ umountproc()
 testperm()
 {
        return
-       PERM=`$_SHOWPERM $DEFAULT_VSERVERDIR/$1/..`
+       PERM=`$_SHOWPERM $__DEFAULT_VSERVERDIR/$1/..`
        if [ "$PERM" != 000 ] ; then
                echo
                echo "**********************************************************"
-               echo $DEFAULT_VSERVERDIR/$1/.. has insecure permissions.
+               echo $__DEFAULT_VSERVERDIR/$1/.. has insecure permissions.
                echo A vserver administrator may be able to visit the root server.
                echo To fix this, do
-               echo "  " chmod 000 $DEFAULT_VSERVERDIR/$1/..
+               echo "  " chmod 000 $__DEFAULT_VSERVERDIR/$1/..
                echo do it anytime you want, even if vservers are running.
                echo "**********************************************************"
                echo
@@ -179,27 +179,27 @@ setipopt(){
 # Extract the initial runlevel from the vserver inittab
 get_initdefault()
 {
-       INITDEFAULT=`grep :initdefault $DEFAULT_VSERVERDIR/$1/etc/inittab | sed 's/:/ /g' | ( read a level b; echo $level)`
+       INITDEFAULT=`grep :initdefault $__DEFAULT_VSERVERDIR/$1/etc/inittab | sed 's/:/ /g' | ( read a level b; echo $level)`
 }
 
 # Read the vserver configuration file, reusing the PROFILE value
 # found in /var/run/vservers
 readlastconf()
 {
-       if [ -f $PKGSTATEDIR/$1.ctx ] ; then
-               . $PKGSTATEDIR/$1.ctx
+       if [ -f $__PKGSTATEDIR/$1.ctx ] ; then
+               . $__PKGSTATEDIR/$1.ctx
                if [ "$S_PROFILE" != "" ] ; then
                        export PROFILE=$S_PROFILE
                fi
        fi
        export PROFILE
-       . $CONFDIR/$1.conf
+       . $__CONFDIR/$1.conf
 }
 usage()
 {
        echo vserver [ options ] server-name command ...
        echo
-       echo server-name is a directory in $DEFAULT_VSERVERDIR
+       echo server-name is a directory in $__DEFAULT_VSERVERDIR
        echo
        echo The commands are:
        echo " build   : Create a virtual server by copying the packages"
@@ -269,24 +269,24 @@ if [ $# -lt 2 ] ; then
        usage
 elif [ "$2" = "build" ] ; then
        # Either the directory does not exist or is empty
-       NBSUB=`ls $DEFAULT_VSERVERDIR/$1 2>/dev/null | grep -v lost+found | wc -l` 
+       NBSUB=`ls $__DEFAULT_VSERVERDIR/$1 2>/dev/null | grep -v lost+found | wc -l` 
        NBSUB=`expr $NBSUB`
        if [ "$NBSUB" != 0 ] ; then
-               echo Virtual server $DEFAULT_VSERVERDIR/$1 already exist
+               echo Virtual server $__DEFAULT_VSERVERDIR/$1 already exist
        else
-               if [ ! -d $DEFAULT_VSERVERDIR ] ; then
-                       mkdir $DEFAULT_VSERVERDIR || exit 1
-                       chmod 000 $DEFAULT_VSERVERDIR
-                       echo Directory $DEFAULT_VSERVERDIR was created with permissions 000
+               if [ ! -d $__DEFAULT_VSERVERDIR ] ; then
+                       mkdir $__DEFAULT_VSERVERDIR || exit 1
+                       chmod 000 $__DEFAULT_VSERVERDIR
+                       echo Directory $__DEFAULT_VSERVERDIR was created with permissions 000
                fi
-               mkdir -p $DEFAULT_VSERVERDIR/$1 || exit 1
-               chmod 755 $DEFAULT_VSERVERDIR/$1
+               mkdir -p $__DEFAULT_VSERVERDIR/$1 || exit 1
+               chmod 755 $__DEFAULT_VSERVERDIR/$1
                if test "$UTIL_VSERVER_AVOID_COPY"; then
-                   mkdir -p $DEFAULT_VSERVERDIR/$1/{etc/rc.d/init.d,sbin,var/run,var/log}
+                   mkdir -p $__DEFAULT_VSERVERDIR/$1/{etc/rc.d/init.d,sbin,var/run,var/log}
                else
-                   cp -ax /sbin /bin /etc /usr /var /lib $DEFAULT_VSERVERDIR/$1/. || exit 1
+                   cp -ax /sbin /bin /etc /usr /var /lib $__DEFAULT_VSERVERDIR/$1/. || exit 1
                fi
-               cd $DEFAULT_VSERVERDIR/$1 || exit 1
+               cd $__DEFAULT_VSERVERDIR/$1 || exit 1
                rm -fr lib/modules/*
                rm -f var/spool/mail/*
                rm -f `find var/run -type f`
@@ -324,7 +324,7 @@ elif [ "$2" = "build" ] ; then
                                *.bak|*~|functions|killall|halt|single)
                                        ;;
                                *)
-                                       #$USR_LIB_VSERVER/capchroot $DEFAULT_VSERVERDIR/$1 /sbin/chkconfig --level 2345 $serv off
+                                       #$USR_LIB_VSERVER/capchroot $__DEFAULT_VSERVERDIR/$1 /sbin/chkconfig --level 2345 $serv off
                                        $0 --silent $1 chkconfig --level 2345 $serv off
                                        ;;
                                esac
@@ -340,14 +340,14 @@ elif [ "$2" = "build" ] ; then
                cp -a "$_VREBOOT" sbin/.
                ln -sf vreboot sbin/vhalt
 
-               echo Directory $DEFAULT_VSERVERDIR/$1 has been populated
-               if [ ! -d $CONFDIR ] ; then
-                       mkdir $CONFDIR
-                       chmod 600 $CONFDIR
-                       echo Directory $CONFDIR has been created
+               echo Directory $__DEFAULT_VSERVERDIR/$1 has been populated
+               if [ ! -d $__CONFDIR ] ; then
+                       mkdir $__CONFDIR
+                       chmod 600 $__CONFDIR
+                       echo Directory $__CONFDIR has been created
                fi
-               if [ ! -f $CONFDIR/$1.conf ] ; then
-                       CONF=$CONFDIR/$1.conf
+               if [ ! -f $__CONFDIR/$1.conf ] ; then
+                       CONF=$__CONFDIR/$1.conf
                        cat >$CONF <<-EOF
 if [ "$PROFILE" = "" ] ; then
        PROFILE=prod
@@ -422,28 +422,28 @@ S_CAPS=""
                        echo $CONF has been created. Look at it\!
                fi
        fi
-elif [ ! -f $CONFDIR/$1.conf ] ; then
-       echo No configuration for this vserver: $CONFDIR/$1.conf
+elif [ ! -f $__CONFDIR/$1.conf ] ; then
+       echo No configuration for this vserver: $__CONFDIR/$1.conf
        exit 1
-elif [ ! -d $DEFAULT_VSERVERDIR/$1/. ] ; then
-       echo No directory for this vserver: $DEFAULT_VSERVERDIR/$1
+elif [ ! -d $__DEFAULT_VSERVERDIR/$1/. ] ; then
+       echo No directory for this vserver: $__DEFAULT_VSERVERDIR/$1
        exit 1
 elif [ "$2" = "start" ] ; then
        echo Starting the virtual server $1
        testperm $1
        if ! $0 $1 running
        then
-               test -x $CONFDIR/$1.sh && $CONFDIR/$1.sh pre-start $1
+               test -x $__CONFDIR/$1.sh && $__CONFDIR/$1.sh pre-start $1
                IPROOT=
                IPROOTMASK=
                IPROOTBCAST=
                IPROOTDEV=
                S_NICE=
                S_FLAGS=
-               . $CONFDIR/$1.conf
+               . $__CONFDIR/$1.conf
                export PROFILE
                ifconfig_iproot $1
-               cd $DEFAULT_VSERVERDIR/$1 || exit 1
+               cd $__DEFAULT_VSERVERDIR/$1 || exit 1
 
                if [ "$PROFILE" != "" ] ; then
                        echo export PROFILE=$PROFILE >etc/PROFILE
@@ -454,7 +454,7 @@ elif [ "$2" = "start" ] ; then
                chgrp ${UTMP_GROUP:-utmp} var/run/utmp
                chmod 0664 var/run/utmp
                rm -f  var/lock/subsys/*
-               mountproc $DEFAULT_VSERVERDIR/$1
+               mountproc $__DEFAULT_VSERVERDIR/$1
                CTXOPT=
                HOSTOPT=
                DOMAINOPT=
@@ -463,11 +463,11 @@ elif [ "$2" = "start" ] ; then
                CAPS=
                get_initdefault $1
                STARTCMD="/etc/rc.d/rc $INITDEFAULT"
-               if [ -x $DEFAULT_VSERVERDIR/$1/etc/init.d/rc ] ; then
+               if [ -x $__DEFAULT_VSERVERDIR/$1/etc/init.d/rc ] ; then
                        STARTCMD="/etc/init.d/rc $INITDEFAULT"
-               elif [ -x $DEFAULT_VSERVERDIR/$1/usr/bin/emerge ] ; then
+               elif [ -x $__DEFAULT_VSERVERDIR/$1/usr/bin/emerge ] ; then
                        STARTCMD="/sbin/rc default"
-               elif [ -x $DEFAULT_VSERVERDIR/$1/etc/rc.d/rc.M ] ; then
+               elif [ -x $__DEFAULT_VSERVERDIR/$1/etc/rc.d/rc.M ] ; then
                        STARTCMD="/etc/rc.d/rc.M"                       
                fi
 
@@ -516,8 +516,8 @@ elif [ "$2" = "start" ] ; then
                if [ "$S_NICE" != "" ] ; then
                        NICECMD="nice -$S_NICE"
                fi
-               mkdir -p $PKGSTATEDIR
-               chmod 700 $PKGSTATEDIR
+               mkdir -p $__PKGSTATEDIR
+               chmod 700 $__PKGSTATEDIR
                setdefulimit
                if [ "$ULIMIT" != "" ] ; then
                        ulimit $ULIMIT
@@ -526,22 +526,22 @@ elif [ "$2" = "start" ] ; then
                #echo CAPS=$CAPS
                # We switch to /vservers/$1 now, because after the
                # security context switch /vservers directory becomes a dead zone.
-               cd $DEFAULT_VSERVERDIR/$1
+               cd $__DEFAULT_VSERVERDIR/$1
                IPOPT=`setipopt $IPROOT`
                export PATH=$DEFAULTPATH
                $NICECMD $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \
                        $_CHCONTEXT_COMPAT $SILENT $DISCONNECT $CAPS $FLAGS $CTXOPT $HOSTOPT $DOMAINOPT --secure \
-                       $_SAVE_S_CONTEXT $PKGSTATEDIR/$1.ctx \
+                       $_SAVE_S_CONTEXT $__PKGSTATEDIR/$1.ctx \
                        $_CAPCHROOT $CHROOTOPT . $STARTCMD
                sleep 2
-               test ! -x $CONFDIR/$1.sh || $CONFDIR/$1.sh post-start $1
+               test ! -x $__CONFDIR/$1.sh || $__CONFDIR/$1.sh post-start $1
        fi
 elif [ "$2" = "running" ] ; then
-       if [ ! -f $PKGSTATEDIR/$1.ctx ] ; then
+       if [ ! -f $__PKGSTATEDIR/$1.ctx ] ; then
                echo Server $1 is not running
                exit 1
        else
-               . $PKGSTATEDIR/$1.ctx
+               . $__PKGSTATEDIR/$1.ctx
                NB=$($USR_SBIN/vps ax | awk '{print $2}' | grep \^$S_CONTEXT\$ | wc -l)
                #NB=`$_CHCONTEXT_COMPAT --silent --ctx $S_CONTEXT ps ax | wc -l`
                #NB=`eval expr $NB + 0`
@@ -556,10 +556,10 @@ elif [ "$2" = "running" ] ; then
 elif [ "$2" = "status" ] ; then
        if $0 $1 running
        then
-               . $PKGSTATEDIR/$1.ctx
+               . $__PKGSTATEDIR/$1.ctx
                NB=$($USR_SBIN/vps ax | awk '{print $2}' | grep \^$S_CONTEXT\$ | wc -l)
                echo $NB processes running
-               echo Vserver uptime: `$USR_LIB_VSERVER/filetime $PKGSTATEDIR/$1.ctx`
+               echo Vserver uptime: `$USR_LIB_VSERVER/filetime $__PKGSTATEDIR/$1.ctx`
        fi
 elif [ "$2" = "stop" ] ; then
        echo Stopping the virtual server $1
@@ -572,19 +572,19 @@ elif [ "$2" = "stop" ] ; then
        readlastconf $1
        if $0 $1 running
        then
-               test -x $CONFDIR/$1.sh && $CONFDIR/$1.sh pre-stop $1
+               test -x $__CONFDIR/$1.sh && $__CONFDIR/$1.sh pre-stop $1
                ifconfig_iproot $1
-               cd $DEFAULT_VSERVERDIR/$1
-               mountproc $DEFAULT_VSERVERDIR/$1
+               cd $__DEFAULT_VSERVERDIR/$1
+               mountproc $__DEFAULT_VSERVERDIR/$1
                # The fakeinit flag tell us how to turn off the server
                get_initdefault $1
                export PREVLEVEL=$INITDEFAULT
                STOPCMD="/etc/rc.d/rc 6"
-               if [ -x $DEFAULT_VSERVERDIR/$1/etc/init.d/rc ] ; then
+               if [ -x $__DEFAULT_VSERVERDIR/$1/etc/init.d/rc ] ; then
                        STOPCMD="/etc/init.d/rc 6"
-               elif [ -x $DEFAULT_VSERVERDIR/$1/usr/bin/emerge ] ; then
+               elif [ -x $__DEFAULT_VSERVERDIR/$1/usr/bin/emerge ] ; then
                        STOPCMD="/sbin/rc shutdown"
-               elif [ -x $DEFAULT_VSERVERDIR/$1/etc/rc.d/rc.6 ] ; then
+               elif [ -x $__DEFAULT_VSERVERDIR/$1/etc/rc.d/rc.6 ] ; then
                        STOPCMD="/etc/rc.d/rc.6"
                fi
 
@@ -608,7 +608,7 @@ elif [ "$2" = "stop" ] ; then
 
                calculateCaps $S_CAPS
 
-               cd $DEFAULT_VSERVERDIR/$1
+               cd $__DEFAULT_VSERVERDIR/$1
                IPOPT=`setipopt $IPROOT`
                export PATH=$DEFAULTPATH
                $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \
@@ -631,9 +631,9 @@ elif [ "$2" = "stop" ] ; then
        fi
        # We umount anyway, because "enter" establish the mount
        # but when you exit, the server is considered not running
-       umountproc $DEFAULT_VSERVERDIR/$1
+       umountproc $__DEFAULT_VSERVERDIR/$1
        cd /
-       test -x $CONFDIR/$1.sh && $CONFDIR/$1.sh post-stop $1
+       test -x $__CONFDIR/$1.sh && $__CONFDIR/$1.sh post-stop $1
        ifconfig_iproot_off $1
 elif [ "$2" = "restart" ] ; then
        if $0 $1 running
@@ -656,10 +656,10 @@ elif [ "$2" = "suexec" ] ; then
                IPROOTBCAST=
                IPROOTDEV=
                readlastconf $1
-               . $CONFDIR/$1.conf
-               cd $DEFAULT_VSERVERDIR/$1
+               . $__CONFDIR/$1.conf
+               cd $__DEFAULT_VSERVERDIR/$1
                ifconfig_iproot $1
-               mountproc $DEFAULT_VSERVERDIR/$1
+               mountproc $__DEFAULT_VSERVERDIR/$1
                PS1="[\u@vserver:$1 \W]"
                export PS1
                VSERVER=$1
@@ -700,15 +700,15 @@ elif [ "$2" = "suexec" ] ; then
                fi
                if $0 $VSERVER running >/dev/null
                then
-                       . $PKGSTATEDIR/$VSERVER.ctx
-                       cd $DEFAULT_VSERVERDIR/$VSERVER
+                       . $__PKGSTATEDIR/$VSERVER.ctx
+                       cd $__DEFAULT_VSERVERDIR/$VSERVER
                        IPOPT=`setipopt $IPROOT`
                        export PATH=$DEFAULTPATH
                        exec $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \
                                $_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure --ctx $S_CONTEXT \
                                $_CAPCHROOT --suid $USERID . "$@"
                else
-                       test -x $CONFDIR/$1.sh && $CONFDIR/$1.sh pre-start $1
+                       test -x $__CONFDIR/$1.sh && $__CONFDIR/$1.sh pre-start $1
                        CTXOPT=
                        HOSTOPT=
                        DOMAINOPT=
@@ -722,13 +722,13 @@ elif [ "$2" = "suexec" ] ; then
                        if [ "$S_DOMAINNAME" != "" ] ; then
                                DOMAINOPT="--domainname $S_DOMAINNAME"
                        fi
-                       mkdir -p $PKGSTATEDIR
-                       cd $DEFAULT_VSERVERDIR/$VSERVER
+                       mkdir -p $__PKGSTATEDIR
+                       cd $__DEFAULT_VSERVERDIR/$VSERVER
                        IPOPT=`setipopt $IPROOT`
                        export PATH=$DEFAULTPATH
                        exec $_CHBIND $SILENT $IPOPT --bcast $IPROOTBCAST \
                                $_CHCONTEXT_COMPAT $SILENT $FLAGS $CAPS --secure $CTXOPT $HOSTOPT $DOMAINOPT \
-                               $_SAVE_S_CONTEXT $PKGSTATEDIR/$VSERVER.ctx \
+                               $_SAVE_S_CONTEXT $__PKGSTATEDIR/$VSERVER.ctx \
                                $_CAPCHROOT --suid $USERID $CHROOTOPT . "$@"
                fi
        fi
@@ -753,11 +753,11 @@ elif [ "$2" = "chkconfig" ] ; then
                LEVELS=$1
                shift
        fi
-       if [ $# != 2 -a ! -x $DEFAULT_VSERVERDIR/$VSERVER/sbin/chkconfig ] ; then
+       if [ $# != 2 -a ! -x $__DEFAULT_VSERVERDIR/$VSERVER/sbin/chkconfig ] ; then
                echo Invalid argument, expected vserver name chkconfig [ --level nnn ] service on\|off
-       elif [ -x $DEFAULT_VSERVERDIR/$VSERVER/sbin/chkconfig ] ; then
+       elif [ -x $__DEFAULT_VSERVERDIR/$VSERVER/sbin/chkconfig ] ; then
                exec $0 --silent $VSERVER exec /sbin/chkconfig "$@"
-       elif [ -x $DEFAULT_VSERVERDIR/$VSERVER/usr/sbin/update-rc.d ] ; then
+       elif [ -x $__DEFAULT_VSERVERDIR/$VSERVER/usr/sbin/update-rc.d ] ; then
                if [ "$2" = "on" -o "$2" = "start" ] ; then
                        $0 --silent $VSERVER exec /usr/sbin/update-rc.d -f $1 remove >/dev/null
                        exec $0 --silent $VSERVER exec /usr/sbin/update-rc.d $1 start 80 2 3 4 5 . stop 20 0 1 6 . >/dev/null
index 1eacba5..5e3bb41 100755 (executable)
@@ -24,7 +24,7 @@ test -e "$UTIL_VSERVER_VARS" || {
 . "$UTIL_VSERVER_VARS"
 . "$_LIB_FUNCTIONS"
 . "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
-. "$PKGLIBDIR/vserver.functions"
+. "$__PKGLIBDIR/vserver.functions"
 
 function showHelp()
 {
index b9ce07a..8db11c2 100755 (executable)
@@ -106,7 +106,7 @@ i=${#vservers[*]}
 
 while test $i -gt 0; do
     let --i
-    d=$CONFDIR/${vservers[$i]}/apps/init
+    d=$__CONFDIR/${vservers[$i]}/apps/init
     f=$d/mark
     { test -n "$OPTION_MARK" -a -r "$f" && grep -qx "$OPTION_MARK" "$f"; } || \
     { test -z "$OPTION_MARK" && test ! -e "$f"; } || \
@@ -142,12 +142,12 @@ EOF
 } >$makedir/Makefile
 
 for i in "${vservers[@]}"; do
-    d=$CONFDIR/$i/apps/init
+    d="$__CONFDIR/$i"/apps/init
     echo "$i"
     test -e "$d"/depends || continue
     cat "$d"/depends
 done | sort -u | while read vserver; do
-    d=$CONFDIR/$vserver/apps/init
+    d="$__CONFDIR/$vserver"/apps/init
 
     case "$OPTION_FLAVOR" in
        start)
index 27d4584..73305de 100644 (file)
@@ -7,89 +7,89 @@ PACKAGE_STRING='@PACKAGE_STRING@'
 PACKAGE_TARNAME='@PACKAGE_TARNAME@'
 PACKAGE_VERSION='@PACKAGE_VERSION@'
 
-CONFDIR='@CONFDIR@'
-INCLUDEDIR='@INCLUDEDIR@'
-INITRDDIR='@INITRDDIR@'
-LEGACYDIR="@LEGACYDIR@"
-LIBDIR='@LIBDIR@'
-LOCKDIR="/var/lock"
-PKGLIBDIR='@PKGLIBDIR@'
-PKGSTATEDIR="@PKGSTATEDIR@"
-PKGSTATEREVDIR="@PKGSTATEREVDIR@"
-SBINDIR='@SBINDIR@'
-SYSCONFDIR='@SYSCONFDIR@'
-VSHELPERSTATEDIR="@VSHELPERSTATEDIR@"
+__CONFDIR='@CONFDIR@'
+__INCLUDEDIR='@INCLUDEDIR@'
+__INITRDDIR='@INITRDDIR@'
+__LEGACYDIR="@LEGACYDIR@"
+__LIBDIR='@LIBDIR@'
+__LOCKDIR="/var/lock"
+__PKGLIBDIR='@PKGLIBDIR@'
+__PKGSTATEDIR="@PKGSTATEDIR@"
+__PKGSTATEREVDIR="@PKGSTATEREVDIR@"
+__SBINDIR='@SBINDIR@'
+__SYSCONFDIR='@SYSCONFDIR@'
+__VSHELPERSTATEDIR="@VSHELPERSTATEDIR@"
 
-DISTRIBDIR="$PKGLIBDIR/distributions"
-PKGLIBDEFAULTDIR="$PKGLIBDIR/defaults"
-RUNDIR="$PKGSTATEDIR"
+__DISTRIBDIR="$__PKGLIBDIR/distributions"
+__PKGLIBDEFAULTDIR="$__PKGLIBDIR/defaults"
+__RUNDIR="$__PKGSTATEDIR"
 
-DEFAULT_VSERVERDIR='@VSERVERDIR@'
-DEFAULT_VSERVERPKGDIR='@VSERVERPKGDIR@'
+__DEFAULT_VSERVERDIR='@VSERVERDIR@'
+__DEFAULT_VSERVERPKGDIR='@VSERVERPKGDIR@'
 
-_CAPCHROOT="$PKGLIBDIR/capchroot"
-_CHAINECHO="$PKGLIBDIR/chain-echo"
-_CHBIND="$SBINDIR/chbind"
-_CHCONTEXT="$SBINDIR/chcontext"
-_CHCONTEXT_COMPAT="$PKGLIBDIR/chcontext-compat"
-_CHECK_UNIXFILE="$PKGLIBDIR/check-unixfile"
-_CHROOT_CAT="$PKGLIBDIR/chroot-cat"
-_CHROOT_RM="$PKGLIBDIR/chroot-rm"
-_EXEC_CD="$SBINDIR/exec-cd"
-_EXEC_ULIMIT="$PKGLIBDIR/exec-ulimit"
-_FAKE_RUNLEVEL="$PKGLIBDIR/fakerunlevel"
-_FILETIME="$PKGLIBDIR/filetime"
-_IFSPEC="$LEGACYDIR/ifspec"
+_CAPCHROOT="$__PKGLIBDIR/capchroot"
+_CHAINECHO="$__PKGLIBDIR/chain-echo"
+_CHBIND="$__SBINDIR/chbind"
+_CHCONTEXT="$__SBINDIR/chcontext"
+_CHCONTEXT_COMPAT="$__PKGLIBDIR/chcontext-compat"
+_CHECK_UNIXFILE="$__PKGLIBDIR/check-unixfile"
+_CHROOT_CAT="$__PKGLIBDIR/chroot-cat"
+_CHROOT_RM="$__PKGLIBDIR/chroot-rm"
+_EXEC_CD="$__SBINDIR/exec-cd"
+_EXEC_ULIMIT="$__PKGLIBDIR/exec-ulimit"
+_FAKE_RUNLEVEL="$__PKGLIBDIR/fakerunlevel"
+_FILETIME="$__PKGLIBDIR/filetime"
+_IFSPEC="$__LEGACYDIR/ifspec"
 _INITSYNC_MINIT_START=:
-_KEEP_CTX_ALIVE="$PKGLIBDIR/keep-ctx-alive"
-_LIB_FUNCTIONS="$PKGLIBDIR/functions"
-_LIB_VSERVER_SETUP_FUNCTIONS="$PKGLIBDIR/vserver-setup.functions"
-_LIB_VSERVER_BUILD_FUNCTIONS="$PKGLIBDIR/vserver-build.functions"
-_LIB_VSERVER_BUILD_FUNCTIONS_APT="$PKGLIBDIR/vserver-build.functions.apt"
-_LIB_VSERVER_BUILD_FUNCTIONS_RPM="$PKGLIBDIR/vserver-build.functions.rpm"
-_LIB_VSERVER_BUILD_FUNCTIONS_YUM="$PKGLIBDIR/vserver-build.functions.yum"
-_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$PKGLIBDIR/vserver-build.functions.pkgmgmt"
-_LISTDEVIP="$LEGACYDIR/listdevip"
-_LOCKFILE="$PKGLIBDIR/lockfile"
-_MASK2PREFIX="$PKGLIBDIR/mask2prefix"
-_PARSERPMDUMP="$LEGACYDIR/parserpmdump"
-_PKGMGMT="$PKGLIBDIR/pkgmgmt"
-_READLINK="$PKGLIBDIR/readlink"
-_REBOOTMGR="$LEGACYDIR/rebootmgr"
-_RPM_FAKE_SO="$PKGLIBDIR/rpm-fake.so"
-_SAVE_S_CONTEXT="$LEGACYDIR/save_s_context"
-_SAVE_CTXINFO="$PKGLIBDIR/save_ctxinfo"
-_SECURE_MOUNT="$PKGLIBDIR/secure-mount"
-_SETATTR="$SBINDIR/setattr"
-_SHOWPERM="$LEGACYDIR/showperm"
-_START_VSERVERS="$PKGLIBDIR/start-vservers"
-_VAPT_GET="$SBINDIR/vapt-get"
-_VAPT_GET_WORKER="$PKGLIBDIR/vapt-get-worker"
-_VATTRIBUTE="$SBINDIR/vattribute"
-_VCONTEXT="$SBINDIR/vcontext"
-_VKILL="$SBINDIR/vkill"
-_VLIMIT="$SBINDIR/vlimit"
-_VNAMESPACE="$SBINDIR/vnamespace"
-_VPKG="$PKGLIBDIR/vpkg"
-_VPROCUNHIDE="$PKGLIBDIR/vprocunhide"
-_VPS="$SBINDIR/vps"
-_VREBOOT="$LEGACYDIR/vreboot"
-_VRPM="$SBINDIR/vrpm"
-_VRPM_PRELOAD="$PKGLIBDIR/vrpm-preload"
-_VRPM_WORKER="$PKGLIBDIR/vrpm-worker"
-_VSCHED="$SBINDIR/vsched"
-_VSERVER="$SBINDIR/vserver"
-_VSERVER_LEGACY="$LEGACYDIR/vserver"
-_VSERVER_BUILD="$PKGLIBDIR/vserver-build"
-_VSERVER_INFO="$SBINDIR/vserver-info"
-_VSERVERKILLALL="$LEGACYDIR/vserverkillall"
-_VSHELPER="$PKGLIBDIR/vshelper"
-_VSHELPER_SYNC="$PKGLIBDIR/vshelper-sync"
-_VSOMETHING="$SBINDIR/vsomething"
-_VUNAME="$SBINDIR/vuname"
-_VUNIFY="$PKGLIBDIR/vunify"
-_VYUM="$SBINDIR/vyum"
-_VYUM_WORKER="$PKGLIBDIR/vyum-worker"
+_KEEP_CTX_ALIVE="$__PKGLIBDIR/keep-ctx-alive"
+_LIB_FUNCTIONS="$__PKGLIBDIR/functions"
+_LIB_VSERVER_SETUP_FUNCTIONS="$__PKGLIBDIR/vserver-setup.functions"
+_LIB_VSERVER_BUILD_FUNCTIONS="$__PKGLIBDIR/vserver-build.functions"
+_LIB_VSERVER_BUILD_FUNCTIONS_APT="$__PKGLIBDIR/vserver-build.functions.apt"
+_LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
+_LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
+_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
+_LISTDEVIP="$__LEGACYDIR/listdevip"
+_LOCKFILE="$__PKGLIBDIR/lockfile"
+_MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
+_PARSERPMDUMP="$__LEGACYDIR/parserpmdump"
+_PKGMGMT="$__PKGLIBDIR/pkgmgmt"
+_READLINK="$__PKGLIBDIR/readlink"
+_REBOOTMGR="$__LEGACYDIR/rebootmgr"
+_RPM_FAKE_SO="$__PKGLIBDIR/rpm-fake.so"
+_SAVE_S_CONTEXT="$__LEGACYDIR/save_s_context"
+_SAVE_CTXINFO="$__PKGLIBDIR/save_ctxinfo"
+_SECURE_MOUNT="$__PKGLIBDIR/secure-mount"
+_SETATTR="$__SBINDIR/setattr"
+_SHOWPERM="$__LEGACYDIR/showperm"
+_START_VSERVERS="$__PKGLIBDIR/start-vservers"
+_VAPT_GET="$__SBINDIR/vapt-get"
+_VAPT_GET_WORKER="$__PKGLIBDIR/vapt-get-worker"
+_VATTRIBUTE="$__SBINDIR/vattribute"
+_VCONTEXT="$__SBINDIR/vcontext"
+_VKILL="$__SBINDIR/vkill"
+_VLIMIT="$__SBINDIR/vlimit"
+_VNAMESPACE="$__SBINDIR/vnamespace"
+_VPKG="$__PKGLIBDIR/vpkg"
+_VPROCUNHIDE="$__PKGLIBDIR/vprocunhide"
+_VPS="$__SBINDIR/vps"
+_VREBOOT="$__LEGACYDIR/vreboot"
+_VRPM="$__SBINDIR/vrpm"
+_VRPM_PRELOAD="$__PKGLIBDIR/vrpm-preload"
+_VRPM_WORKER="$__PKGLIBDIR/vrpm-worker"
+_VSCHED="$__SBINDIR/vsched"
+_VSERVER="$__SBINDIR/vserver"
+_VSERVER_LEGACY="$__LEGACYDIR/vserver"
+_VSERVER_BUILD="$__PKGLIBDIR/vserver-build"
+_VSERVER_INFO="$__SBINDIR/vserver-info"
+_VSERVERKILLALL="$__LEGACYDIR/vserverkillall"
+_VSHELPER="$__PKGLIBDIR/vshelper"
+_VSHELPER_SYNC="$__PKGLIBDIR/vshelper-sync"
+_VSOMETHING="$__SBINDIR/vsomething"
+_VUNAME="$__SBINDIR/vuname"
+_VUNIFY="$__PKGLIBDIR/vunify"
+_VYUM="$__SBINDIR/vyum"
+_VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
 
 _AWK="@AWK@"
 _CAT="@CAT@"
index f4044af..76307ba 100755 (executable)
@@ -61,8 +61,8 @@ while test -n "$1"; do
 done
 
 findFile UNHIDEFILE \
-    "$CONFDIR"/.defaults/apps/vprocunhide/files \
-    "$PKGLIBDEFAULTDIR"/vprocunhide-files
+    "$__CONFDIR"/.defaults/apps/vprocunhide/files \
+    "$__PKGLIBDEFAULTDIR"/vprocunhide-files
 
 ok=1
 passed=
index b0a6595..efa6e88 100755 (executable)
@@ -25,4 +25,4 @@ test -e "$UTIL_VSERVER_VARS" || {
 }
 . "$UTIL_VSERVER_VARS"
 
-exec $SBINDIR/chcontext --silent --ctx 1 pstree "$@"
+exec $__SBINDIR/chcontext --silent --ctx 1 pstree "$@"
index 9803a2e..d0a11c0 100755 (executable)
@@ -99,7 +99,7 @@ the GNU General Public License.  This program has absolutely no warranty."
 
 function suexec()
 {
-    . $PKGLIBDIR/vserver.suexec
+    . $__PKGLIBDIR/vserver.suexec
 }
 
 function restart()
@@ -161,7 +161,7 @@ allow_legacy=
 case "$vserver" in
     (./*) VSERVER_DIR=`pwd`/$vserver;;
     (/*)  VSERVER_DIR=$vserver;;
-    (*)          VSERVER_DIR=$CONFDIR/$vserver
+    (*)          VSERVER_DIR=$__CONFDIR/$vserver
          allow_legacy=1
          ;;
 esac
@@ -169,7 +169,7 @@ esac
 if test -n "$allow_legacy"; then
     do_legacy=
     test ! -e "$VSERVER_DIR/legacy" || do_legacy=1
-    test -d "$VSERVER_DIR" -o ! -e "$CONFDIR/$vserver.conf" || do_legacy=1
+    test -d "$VSERVER_DIR" -o ! -e "$__CONFDIR/$vserver.conf" || do_legacy=1
 
     test -z "$do_legacy" || {
        echo $"WARNING: can not find configuration, assuming legacy method" >&2
@@ -198,11 +198,11 @@ fi
 test "$2" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \
     exec $_VNAMESPACE --new -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}"
 
-. $PKGLIBDIR/vserver.functions
+. $__PKGLIBDIR/vserver.functions
 case "$2" in
     (start|stop)
        shift 2
-       . $PKGLIBDIR/vserver.$cmd
+       . $__PKGLIBDIR/vserver.$cmd
        ;;
     (suexec|restart)
        shift 2
index a51e163..dfa832c 100755 (executable)
@@ -38,9 +38,9 @@ Options:
     --force     ...  remove/rename already existing vservers with the same name
     -m <method> ...  use method <method>; see below for possible values
     --rootdir <dir>
-                ...  [default: $DEFAULT_VSERVERDIR]
+                ...  [default: $__DEFAULT_VSERVERDIR]
     --pkgbase <dir>
-                ...  [default: $DEFAULT_VSERVERPKGDIR]
+                ...  [default: $__DEFAULT_VSERVERPKGDIR]
       
 cfg-options are: $SETUP_HELPMSG
 
@@ -85,7 +85,7 @@ the GNU General Public License.  This program has absolutely no warranty."
 set -e
 
 declare -a default_opts=()
-test -n "$NO_DEFAULT_OPTS" || getFileArray default_opts "$CONFDIR/.defaults/apps/build/options" || :
+test -n "$NO_DEFAULT_OPTS" || getFileArray default_opts "$__CONFDIR/.defaults/apps/build/options" || :
 
 tmp=$(getopt -o +m:n: --long force,debug,help,version,rootdir:,pkgbase:,$SETUP_OPTIONS -n "$(basename $0)" -- \
        "${default_opts[@]}" "$@") || exit 1
@@ -122,7 +122,7 @@ setup_setDefaults "$VSERVER_NAME"
 case x"$method" in
     (xlegacy)  exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
     (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm)
-               . $PKGLIBDIR/vserver-build.$method
+               . $__PKGLIBDIR/vserver-build.$method
                ;;
     (x)                panic $"No build-method specified";;
     (*)                panic $"Unknown build-method '$method'";;
index 3e79bca..e260a50 100644 (file)
@@ -50,7 +50,7 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 rpm.initDB           "$SETUP_CONFDIR"
 $_VAPT_GET "$SETUP_CONFDIR" -- update
 apt.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
index 27fb8d2..eb77fa1 100644 (file)
@@ -33,7 +33,7 @@ function initVariables
 
     test -n "${mirror-unset}" || {
        local aux
-       findFile aux "$CONFDIR"/.defaults/apps/debootstrap/mirror ''
+       findFile aux "$__CONFDIR"/.defaults/apps/debootstrap/mirror ''
        test -z "$aux" || read mirror <"$aux"
     }
 }
@@ -54,7 +54,7 @@ function findDebootstrap
         workdir=$dir
         dst=$dir/debootstrap.deb
         
-        findFile DEBOOTSTRAP_URI "$CONFDIR"/.defaults/apps/debootstrap/uri "$PKGLIBDEFAULTDIR"/debootstrap.uri
+        findFile DEBOOTSTRAP_URI "$__CONFDIR"/.defaults/apps/debootstrap/uri "$__PKGLIBDEFAULTDIR"/debootstrap.uri
         read tmp <$DEBOOTSTRAP_URI
         case "$tmp" in
        (/*)                    ln -s "$tmp" "$dst";;
@@ -73,7 +73,7 @@ to util-vserver and removed the known ones. To fix this, go to
 (or a nearby mirror) and search the URL for the most recent *.deb
 package matching your platform. Then, put this URL into
 
-   $CONFDIR/.defaults/apps/debootstrap/uri
+   $__CONFDIR/.defaults/apps/debootstrap/uri
 
 and retry the vserver-build command again.
 EOF
index af2843e..884e14d 100644 (file)
@@ -71,7 +71,7 @@ function _setRootDir
 {
     test -z "$ROOTDIR" || return 0
     
-    for item in "\"$CONFDIR/.defaults/vdirbase\" 1" "$DEFAULT_VSERVERDIR"; do
+    for item in "\"$__CONFDIR/.defaults/vdirbase\" 1" "$__DEFAULT_VSERVERDIR"; do
        eval set -- "$item"
        ROOTDIR=$1
        ROOTDIR_REL=$2
@@ -172,11 +172,11 @@ exist already; please try to use '--force', or remove them manually"
     done <$_DEV_FILE
 
     mkdir -p "$VDIR"/proc
-    findAndCopy "$VDIR"/etc/hosts         "$CONFDIR"/.defaults/files/hosts "$CONFDIR/.distributions/$DISTRIBUTION"/files/hosts \
-                                         "$DISTRIBDIR/$DISTRIBUTION"/files/hosts "$DISTRIBDIR"/defaults/files/hosts ""
+    findAndCopy "$VDIR"/etc/hosts         "$__CONFDIR"/.defaults/files/hosts "$__CONFDIR/.distributions/$DISTRIBUTION"/files/hosts \
+                                         "$__DISTRIBDIR/$DISTRIBUTION"/files/hosts "$__DISTRIBDIR"/defaults/files/hosts ""
 
     for i in nsswitch.conf krb5.conf krb.conf krb.realms ldap.conf localtime resolv.conf; do
-       findAndCopy "$VDIR"/etc/$i  "$CONFDIR/.defaults/files/$i" "$CONFDIR/.distributions/$DISTRIBUTION/files/$i" ""
+       findAndCopy "$VDIR"/etc/$i  "$__CONFDIR/.defaults/files/$i" "$__CONFDIR/.distributions/$DISTRIBUTION/files/$i" ""
     done
 }
 
@@ -186,8 +186,8 @@ function base.initVariables
     _setVserverDir
     _setVdir
 
-    findFile _DEV_FILE      "$CONFDIR/.distributions/$DISTRIBUTION/devs"      "$DISTRIBDIR/$DISTRIBUTION/devs"     "$DISTRIBDIR/defaults/devs"
-    findDir  _EXECDIR       "$CONFDIR/.distributions/$DISTRIBUTION/execdir"   "$DISTRIBDIR/$DISTRIBUTION/execdir"  /
-    findFile BUILD_INITPRE  "$CONFDIR/.distributions/$DISTRIBUTION/initpre"   "$DISTRIBDIR/$DISTRIBUTION/initpre"  ""
-    findFile BUILD_INITPOST "$CONFDIR/.distributions/$DISTRIBUTION/initpost"  "$DISTRIBDIR/$DISTRIBUTION/initpost" ""
+    findFile _DEV_FILE      "$__CONFDIR/.distributions/$DISTRIBUTION/devs"      "$__DISTRIBDIR/$DISTRIBUTION/devs"     "$__DISTRIBDIR/defaults/devs"
+    findDir  _EXECDIR       "$__CONFDIR/.distributions/$DISTRIBUTION/execdir"   "$__DISTRIBDIR/$DISTRIBUTION/execdir"  /
+    findFile BUILD_INITPRE  "$__CONFDIR/.distributions/$DISTRIBUTION/initpre"   "$__DISTRIBDIR/$DISTRIBUTION/initpre"  ""
+    findFile BUILD_INITPOST "$__CONFDIR/.distributions/$DISTRIBUTION/initpost"  "$__DISTRIBDIR/$DISTRIBUTION/initpost" ""
 }
index dd54cae..eee55ed 100644 (file)
@@ -43,18 +43,18 @@ function apt.installBasePackages
 function apt.initVariables
 {
     findFile APTCONFDEFAULT \
-       "$CONFDIR/.distributions/$DISTRIBUTION/apt.conf" \
-       "$CONFDIR/.defaults/apps/pkgmgmt/apt.conf" \
-       "$DISTRIBDIR/$DISTRIBUTION/apt.conf" \
-       "$DISTRIBDIR/defaults/apt.conf" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/apt.conf" \
+       "$__CONFDIR/.defaults/apps/pkgmgmt/apt.conf" \
+       "$__DISTRIBDIR/$DISTRIBUTION/apt.conf" \
+       "$__DISTRIBDIR/defaults/apt.conf" \
        ''
 
     findFile APTVENDORDEFAULT \
-       "$CONFDIR/.distributions/$DISTRIBUTION/vendor.conf" \
-       "$CONFDIR/.defaults/apps/pkgmgmt/vendor.conf" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/vendor.conf" \
+       "$__CONFDIR/.defaults/apps/pkgmgmt/vendor.conf" \
        /etc/apt/vendors.list \
-       "$DISTRIBDIR/$DISTRIBUTION/vendor.conf" \
-       "$DISTRIBDIR/defaults/vendor.conf" \
+       "$__DISTRIBDIR/$DISTRIBUTION/vendor.conf" \
+       "$__DISTRIBDIR/defaults/vendor.conf" \
        ''
 }
 
@@ -63,9 +63,9 @@ function apt.initFilesystem
     mkdir -p "$PKGCFGDIR"/apt/{etc/sources.list.d,etc/vendors.list.d,etc/apt.conf.d,archives/partial,cache,state/lists/partial}
     
     populateDirectory "$PKGCFGDIR/apt/etc" \
-       "$DISTRIBDIR/defaults/apt" \
-       "$DISTRIBDIR/$DISTRIBUTION/apt" \
-       "$CONFDIR/.distributions/$DISTRIBUTION/apt"
+       "$__DISTRIBDIR/defaults/apt" \
+       "$__DISTRIBDIR/$DISTRIBUTION/apt" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/apt"
 
     local f="$PKGCFGDIR"/apt/etc/apt.conf
     if test -e "$f"; then
index 3932807..086579e 100644 (file)
@@ -22,7 +22,7 @@ function pkgmgmt._setPkgCfgBase
 {
     test -z "$PKGCFGBASE" || return 0
 
-    for item in "\"$CONFDIR/.defaults/apps/pkgmgmt/base\" 1" ${ROOTDIR:+"$ROOTDIR/.pkg"} "$DEFAULT_VSERVERPKGDIR"; do
+    for item in "\"$__CONFDIR/.defaults/apps/pkgmgmt/base\" 1" ${ROOTDIR:+"$ROOTDIR/.pkg"} "$__DEFAULT_VSERVERPKGDIR"; do
        eval set -- "$item"
        PKGCFGBASE=$1
        PKGCFGBASE_REL=$2
@@ -66,12 +66,12 @@ function pkgmgmt.initFilesystem
        exit 1
     }
 
-    mkdir -p "$SETUP_CONFDIR"/apps/pkgmgmt
+    mkdir -p "${SETUP_CONFDIR:?}"/apps/pkgmgmt
 
     test -z "$PKGCFGDIR" || {
        ln -s "$PKGCFGDIR" "$SETUP_CONFDIR/apps/pkgmgmt/base"
 
-       test "$_EXECDIR" = / || ln -s "$_EXECDIR" "$SETUP_CONFDIR/apps/pkgmgmt/execdir"
+       test "$_EXECDIR" = / || ln -s "${_EXECDIR:?}" "$SETUP_CONFDIR/apps/pkgmgmt/execdir"
     }
 
 }
@@ -79,5 +79,5 @@ function pkgmgmt.initFilesystem
 function pkgmgmt.initVariables
 {
     pkgmgmt._setPkgCfg
-    findDir  PKGINSTALLDIR         "$CONFDIR/.distributions/$DISTRIBUTION/pkgs"      "$DISTRIBDIR/$DISTRIBUTION/pkgs"     /
+    findDir  PKGINSTALLDIR  "$__CONFDIR/.distributions/$DISTRIBUTION/pkgs"  "$__DISTRIBDIR/$DISTRIBUTION/pkgs"     /
 }
index 3280f96..d3a9795 100644 (file)
@@ -45,7 +45,7 @@ function rpm.initVariables
        RPMDB_PATH=/.rpmdb || \
        RPMDB_PATH=/dev
 
-    findDir RPMLIBDIR "$CONFDIR/.distributions/$DISTRIBUTION/rpmlib" "$DISTRIBDIR/$DISTRIBUTION/rpmlib" /
+    findDir RPMLIBDIR "$__CONFDIR/.distributions/$DISTRIBUTION/rpmlib" "$__DISTRIBDIR/$DISTRIBUTION/rpmlib" /
 }
 
 function rpm.initFilesystem
@@ -60,9 +60,9 @@ function rpm.initFilesystem
 
     mkdir -p "$PKGCFGDIR"/rpm/{etc,state}
     populateDirectory "$PKGCFGDIR/rpm/etc" \
-       "$DISTRIBDIR/defaults/rpm" \
-       "$DISTRIBDIR/$DISTRIBUTION/rpm" \
-       "$CONFDIR/.distributions/$DISTRIBUTION/rpm"
+       "$__DISTRIBDIR/defaults/rpm" \
+       "$__DISTRIBDIR/$DISTRIBUTION/rpm" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/rpm"
 
     echo "%_dbpath $RPMDB_PATH" >>"$PKGCFGDIR/rpm/etc/macros"
 
@@ -105,8 +105,8 @@ function rpmlist.initByDistribution()
     declare -a _rlid_res=() 
     
 
-    findDir _rlid_listdir "$CONFDIR/.distributions/$2/rpmlist.d" \
-                         "$DISTRIBDIR/$2/rpmlist.d" \
+    findDir _rlid_listdir "$__CONFDIR/.distributions/$2/rpmlist.d" \
+                         "$__DISTRIBDIR/$2/rpmlist.d" \
                          ''
                    
     test -d "$_rlid_listdir" || return 0
index c0b03ea..67a253a 100644 (file)
@@ -43,8 +43,8 @@ function yum.installBasePackages
 function yum.initVariables
 {
     findDir  YUMREPOSDEFAULT \
-       "$CONFDIR/.distributions/$DISTRIBUTION/yum.repos.d" \
-       "$DISTRIBDIR/$DISTRIBUTION/yum.repos.d" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/yum.repos.d" \
+       "$__DISTRIBDIR/$DISTRIBUTION/yum.repos.d" \
        ''
 }
 
@@ -68,9 +68,9 @@ function yum.initFilesystem
     mkdir -p "$PKGCFGDIR"/yum/{etc,cache}
     
     populateDirectory "$PKGCFGDIR/yum/etc" \
-       "$DISTRIBDIR/defaults/yum" \
-       "$DISTRIBDIR/$DISTRIBUTION/yum" \
-       "$CONFDIR/.distributions/$DISTRIBUTION/yum"
+       "$__DISTRIBDIR/defaults/yum" \
+       "$__DISTRIBDIR/$DISTRIBUTION/yum" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/yum"
 
     ## workaround for yum's automatism to search the configuration in the chroot
     
index 8592152..2cc7819 100644 (file)
@@ -91,7 +91,7 @@ cd "$tmpdir"
 ######  do the real work
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 rpm.initDB           "$SETUP_CONFDIR"
 
 opts=()
index a9ea210..8722c80 100644 (file)
@@ -50,7 +50,7 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 rpm.initDB           "$SETUP_CONFDIR"
 yum.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
 $_VYUM "$SETUP_CONFDIR" -- clean all
index 49396fc..6489aa4 100755 (executable)
@@ -99,7 +99,7 @@ flag a vserver can even be operationally moved to different hardware within
 seconds.
 
 The -i and -d flags can be used to minimally reconfigure the destination
-vserver (rewrites /etc/vservers/newname.conf and $DEFAULT_VSERVERDIR/newname/etc/hosts)
+vserver (rewrites /etc/vservers/newname.conf and $__DEFAULT_VSERVERDIR/newname/etc/hosts)
 
 Options:
        -h, --help              this help
@@ -143,7 +143,7 @@ rsh=(false)
 colon=":"
 domain=""
 ip=""
-vsroot=$DEFAULT_VSERVERDIR
+vsroot=$__DEFAULT_VSERVERDIR
 
 if [ $# -eq 0 ]; then  # Script invoked with no command-line args?
        usage
@@ -278,7 +278,7 @@ if [ -n "$ip" ] && \
 fi
 
 # This works both locally and remote
-if ($shcmd $dhost $SBINDIR/vserver $newname running | grep 'is running'); then
+if ($shcmd $dhost $__SBINDIR/vserver $newname running | grep 'is running'); then
        warn "destination vserver \"$newname\" is running" 
        error 1 "Cannot copy over a running vserver"
 fi
@@ -290,7 +290,7 @@ info "Attempting to copy $vserver to $dhost$colon$newname"
 
 if $stopstart; then
        info "Stopping virtual server \"$vserver\" on localhost"
-       $SBINDIR/vserver $vserver stop
+       $__SBINDIR/vserver $vserver stop
 fi
 
 info "Syncing directories"
@@ -365,8 +365,8 @@ fi
 
 if $stopstart; then
        info "Starting virtual server \"$vserver\" on $dhost"
-       $shcmd $dhost $SBINDIR/vserver $vserver start
-       if ($shcmd $dhost $SBINDIR/vserver $vserver running | \
+       $shcmd $dhost $__SBINDIR/vserver $vserver start
+       if ($shcmd $dhost $__SBINDIR/vserver $vserver running | \
        grep 'not running'); then
                error 1 "Virtual server \"$vserver\" failed to start on $dhost"
        fi
index 0dc0634..edab477 100644 (file)
@@ -32,9 +32,9 @@ declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefi
 declare -r SETUP_HELPMSG=$"
     --context   ...  the static context of the vserver [default: none; a dynamic
                      context will be assumed]
-    --confdir   ...  [default: $CONFDIR/<name>]
+    --confdir   ...  [default: $__CONFDIR/<name>]
     --lockfile <filename>
-               ...  [default: $RUNDIR/<name>]
+               ...  [default: $__RUNDIR/<name>]
     --hostname <hostname>
     --netdev   <device>
     --netbcast <broadcast>
@@ -129,9 +129,9 @@ function _setup_writeInterface
 
 function setup_setDefaults
 {
-    : ${SETUP_CONFDIR:=$CONFDIR/$1}
-    : ${SETUP_LOCKFILE:=$RUNDIR/$1}
-    findFile SETUP_FSTAB "$CONFDIR"/.defaults/fstab "$PKGLIBDEFAULTDIR"/fstab
+    : ${SETUP_CONFDIR:=$__CONFDIR/$1}
+    : ${SETUP_LOCKFILE:=$__RUNDIR/$1}
+    findFile SETUP_FSTAB "$__CONFDIR"/.defaults/fstab "$__PKGLIBDEFAULTDIR"/fstab
 }
 
 function setup_writeOption
index 7b9076b..a9cea8a 100644 (file)
@@ -164,7 +164,7 @@ function getEnterShell
 
     ENTER_SHELL=()
 
-    getFileValue ENTER_SHELL "$vdir"/shell "$CONFDIR"/.defaults/shell
+    getFileValue ENTER_SHELL "$vdir"/shell "$__CONFDIR"/.defaults/shell
     
     test -n "$ENTER_SHELL" || {
        local i
@@ -513,7 +513,7 @@ function enableInterfaces
     local i=0
     declare -a var
 
-    lock "$LOCKDIR"/vserver.interfaces
+    lock "$__LOCKDIR"/vserver.interfaces
 
     while test $i -lt $INTERFACE_CMDS_IDX; do
        eval var='( "${INTERFACE_CMDS_'$i'[@]}" )'
@@ -551,7 +551,7 @@ function disableInterfaces
     local i=$INTERFACE_CMDS_IDX
     declare -a var
 
-    lock "$LOCKDIR"/vserver.interfaces
+    lock "$__LOCKDIR"/vserver.interfaces
     
     while test $i -gt 0; do
        let --i || :
@@ -660,7 +660,7 @@ function mountVserver
          -e "$cfgdir"/fstab.local -o \
         -e "$cfgdir"/fstab.remote || return 0
 
-    findObject -r mtab_src "$cfgdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab "$PKGLIBDEFAULTDIR"/mtab /dev/null
+    findObject -r mtab_src "$cfgdir"/apps/init/mtab "$__CONFDIR"/.defaults/init/mtab "$__PKGLIBDEFAULTDIR"/mtab /dev/null
     
     pushd "$vdir" >/dev/null
     $_CHROOT_CAT /etc/mtab <"$mtab_src"
@@ -762,7 +762,7 @@ function execScriptlets
     declare -r flavor=$3
     local base i
 
-    for base in "$vdir"/scripts "$CONFDIR"/.defaults/scripts; do
+    for base in "$vdir"/scripts "$__CONFDIR"/.defaults/scripts; do
        local   DONT_SKIP_DEFAULTS=
        local   already_handled=
        
index 99a123e..2913781 100644 (file)
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-lock "$LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup
+lock "$__LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup
 
 if isVserverRunning "$VSERVER_DIR"; then
     warning $"vserver '$VSERVER_NAME' already running"
index 8530927..40198b4 100644 (file)
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
-lock "$LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup
+lock "$__LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup
 
 if ! isVserverRunning "$VSERVER_DIR" S_CONTEXT; then
     warning $"vserver '$VSERVER_NAME' is not running" >&2
index 49f9378..7770a6b 100644 (file)
@@ -25,7 +25,7 @@ test -e "$UTIL_VSERVER_VARS" || {
 }
 . "$UTIL_VSERVER_VARS"
 
-cd $DEFAULT_VSERVERDIR
+cd $__DEFAULT_VSERVERDIR
 for vserv in *
 do
        if [ -f /etc/vservers/$vserv.conf ] ; then
@@ -43,7 +43,7 @@ do
                        esac
                done
                echo "  <status>"
-               $SBINDIR/vserver $vserv status
+               $_VSERVER $vserv status
                echo "  </status>"
                echo "</m:vserver>"
        fi
index b14aa69..7fd7059 100755 (executable)
@@ -84,7 +84,7 @@ function doInternalMethod
 
        (*)
            local script
-           findObject -x script "$CONFDIR"/.defaults/apps/vshelper-methods/"$method" "$PKGLIBDIR"/vshelper-methods/"$method" ''
+           findObject -x script "$__CONFDIR"/.defaults/apps/vshelper-methods/"$method" "$__PKGLIBDIR"/vshelper-methods/"$method" ''
            
            test -n '$script' || {
                warning $"No handler for internal method '$method' found"
@@ -117,8 +117,8 @@ test "$1" != '--version' || showVersion
 test "$1" != '--help'    || showHelp
 
 if ! tty -s; then
-    findObject -e _VS_LOGFILE "$CONFDIR"/.defaults/apps/vshelper/logfile /dev/null
-    findObject -e _VS_ERRFILE "$CONFDIR"/.defaults/apps/vshelper/logfile /dev/null
+    findObject -e _VS_LOGFILE "$__CONFDIR"/.defaults/apps/vshelper/logfile /dev/null
+    findObject -e _VS_ERRFILE "$__CONFDIR"/.defaults/apps/vshelper/logfile /dev/null
 
     exec   </dev/null
     exec  >>$_VS_LOGFILE
@@ -146,7 +146,7 @@ else
     panic $"vshelper functionality not supported by kernel"
 fi
 
-findObject -x delegate "$CONFDIR"/.defaults/apps/vshelper-delegate/"$ACTION" "$PKGLIBDIR"/vshelper-delegate/"$ACTION" ''
+findObject -x delegate "$__CONFDIR"/.defaults/apps/vshelper-delegate/"$ACTION" "$__PKGLIBDIR"/vshelper-delegate/"$ACTION" ''
 test -e "$delegate" && exec -a "$ACTION" "$delegate" "$@"
 
 this_xid=$($_VSERVER_INFO - XID)
@@ -171,7 +171,7 @@ test "$XID" = "$responsible_xid" || {
 ARGS=( "$@" )
 
 declare -a state
-getFileArray state "$VSHELPERSTATEDIR/$XID" && test ${#state[@]} -ge 2 || {
+getFileArray state "$__VSHELPERSTATEDIR/$XID" && test ${#state[@]} -ge 2 || {
     logging "'vshelper' not configured for xid '$XID'"
     exit 0
 }
index 93bc8a3..24d3eaa 100755 (executable)
@@ -40,6 +40,6 @@ else
        do
                IPOPT="$IPOPT --ip $oneip"
        done
-       echo exec $SBINDIR/chbind $IPOPT /etc/init.d/$SERVICE "$@"
-       exec $SBINDIR/chbind $IPOPT /etc/init.d/$SERVICE "$@"
+       echo exec $CHBIND $IPOPT /etc/init.d/$SERVICE "$@"
+       exec $CHBIND $IPOPT /etc/init.d/$SERVICE "$@"
 fi
index 6aeb35a..5ebf25f 100755 (executable)
@@ -25,4 +25,4 @@ test -e "$UTIL_VSERVER_VARS" || {
 }
 . "$UTIL_VSERVER_VARS"
 
-exec $SBINDIR/chcontext --silent --ctx 1 top "$@"
+exec $__SBINDIR/chcontext --silent --ctx 1 top "$@"
index 083cafe..8d60dd9 100755 (executable)
@@ -18,14 +18,14 @@ PIDFILE=/var/run/rebootmgr.pid
 case "$1" in
   start)
        echo "Starting the reboot manager"
-       cd $CONFDIR
+       cd $__CONFDIR
        VSERVERS=
        for serv in *.conf
        do
                test -f "$serv" || continue
 
                serv=`basename $serv .conf`
-               if [ -d $DEFAULT_VSERVERDIR/$serv ] ; then
+               if [ -d $__DEFAULT_VSERVERDIR/$serv ] ; then
                        VSERVERS="$VSERVERS $serv"
                fi
        done
index f5d1940..6e41071 100755 (executable)
@@ -13,7 +13,7 @@ test -e "$UTIL_VSERVER_VARS" || {
 # Print the vserver name in priority/alpha order
 sortserver(){
        (
-       cd $CONFDIR
+       cd $__CONFDIR
        for serv in *.conf
        do
                test -f "$serv" || continue
@@ -28,7 +28,7 @@ sortserver(){
 
 startservers(){
        echo "Starting the virtual servers"
-       cd $CONFDIR
+       cd $__CONFDIR
        for name in `sortserver`
        do
                ONBOOT=
@@ -59,7 +59,7 @@ case "$1" in
        ;;
   stop)
        echo "Stopping the virtual servers"
-       cd $CONFDIR
+       cd $__CONFDIR
        for name in `sortserver -r`
        do
                $_VSERVER_LEGACY $name stop
@@ -74,7 +74,7 @@ case "$1" in
        echo Not implemented
        ;;
   status)
-       cd $CONFDIR
+       cd $__CONFDIR
        for serv in *.conf
        do
                ONBOOT=no