Skip to content
Snippets Groups Projects
Commit 8bc9312e authored by intrigeri's avatar intrigeri
Browse files

handlers/sys: start to use new lib/vserver functionality

parent 435e859a
Branches
Tags
No related merge requests found
...@@ -7,7 +7,8 @@ version 0.9.3 -- unreleased ...@@ -7,7 +7,8 @@ version 0.9.3 -- unreleased
code refactor: code refactor:
. now uses vservers lib to initialize vservers support . now uses vservers lib to initialize vservers support
handler changes handler changes
duplicity, mysql, pgsql, rdiff, svn: use new lib/vserver functionality duplicity, mysql, pgsql, rdiff, svn, sys: start to use (at different
degrees) new lib/vserver functionality
mysql: mysql:
. fixed no user defaults file processing . fixed no user defaults file processing
duplicity: duplicity:
......
...@@ -33,23 +33,19 @@ getconf sfdisk_options "" ...@@ -33,23 +33,19 @@ getconf sfdisk_options ""
getconf hwinfo_options "" getconf hwinfo_options ""
# See if vservers are configured # See if vservers are configured
if [ "$vservers" = "yes" ] local usevserver=no
if [ $vservers_are_available = yes ]
then then
if [ ! -d $VROOTDIR ]
then
fatal "vservers enabled, but $VROOTDIR does not exist!"
else
info "vserver method enabled" info "vserver method enabled"
usevserver=1 usevserver=yes
fi
fi fi
if [ "$packages" == "yes" ]; then if [ "$packages" == "yes" ]; then
if [ $usevserver ] if [ $usevserver = yes ]
then then
nodpkg="lost+found|ARCHIVES" nodpkg="lost+found|ARCHIVES"
info "vserver root directory set to: $VROOTDIR" info "vserver root directory set to: $VROOTDIR"
for vserver in `ls $VROOTDIR | grep -E -v $nodpkg` for vserver in $found_vservers
do do
info "examining vserver: $vserver" info "examining vserver: $vserver"
running=`$VSERVERINFO $vserver RUNNING` running=`$VSERVERINFO $vserver RUNNING`
...@@ -97,7 +93,7 @@ fi ...@@ -97,7 +93,7 @@ fi
# #
if [ "$packages" == "yes" ]; then if [ "$packages" == "yes" ]; then
if [ $usevserver ] if [ $usevserver = yes ]
then then
for vserver in `ls $VROOTDIR | grep -E -v $nodpkg` for vserver in `ls $VROOTDIR | grep -E -v $nodpkg`
do do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment