X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fdistrib%2Finstall-rh7.2;h=3108962bb3368e269b6507feda88a16c1f1f1392;hb=c8a5f78c6350e9adae32fbcad8e4fbae95766604;hp=b3bd0ca07594ac613158143b5b83aa2e26accab8;hpb=da691fd4bad5e187b307b7fd86bf5fd61e47c3fc;p=util-vserver.git diff --git a/util-vserver/distrib/install-rh7.2 b/util-vserver/distrib/install-rh7.2 index b3bd0ca..3108962 100644 --- a/util-vserver/distrib/install-rh7.2 +++ b/util-vserver/distrib/install-rh7.2 @@ -23,17 +23,25 @@ # Specify the name of the vserver # "install-rh7.2 test" will create /vservers/test -USR_LIB_VSERVER=$(dirname $0) +: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +test -e "$UTIL_VSERVER_VARS" || { + echo "Can not find util-vserver installation; aborting..." + exit 1 +} +. "$UTIL_VSERVER_VARS" + +USR_LIB_VSERVER=$PKGLIBDIR + if [ $# != 1 ] ; then echo install-rh7.2 vserver-id -elif [ -d /vservers/$1/var/lib/rpm ] ; then - echo /vservers/$1 already exist +elif [ -d $VROOTDIR/$1/var/lib/rpm ] ; then + echo $VROOTDIR/$1 already exist elif [ ! -d /mnt/cdrom/RedHat/RPMS ] ; then echo No rpms in /mnt/cdrom/RedHat/RPMS. Is the CD mounted \? else echo `ls /mnt/cdrom/RedHat/RPMS/*.noarch.rpm \ /mnt/cdrom/RedHat/RPMS/*.i386.rpm | wc -l` packages to install - VROOT=/vservers/$1 + VROOT=$VROOTDIR/$1 mkdir -p $VROOT/proc mount -t proc none $VROOT/proc mkdir -p $VROOT/var/lib/rpm