From: Enrico Scholz Date: Wed, 22 Oct 2003 23:23:11 +0000 (+0000) Subject: used $DEFAULT_VSERVERDIR and $DEFAULT_VSERVERPKGDIR instead of the X-Git-Tag: VERSION_0_10~1123 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f21665e19c4d0eb24bc19d02c1cd2779a80fade3;p=util-vserver.git used $DEFAULT_VSERVERDIR and $DEFAULT_VSERVERPKGDIR instead of the hardcoded '/vservers' values git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@293 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver-build b/util-vserver/scripts/vserver-build index 83aee84..4355d67 100755 --- a/util-vserver/scripts/vserver-build +++ b/util-vserver/scripts/vserver-build @@ -38,9 +38,9 @@ Options: --force ... remove/rename already existing vservers with the same name -m ... use method ; see below for possible values --rootdir - ... [default: /vservers] + ... [default: $DEFAULT_VSERVERDIR] --pkgcfgbase - ... [default: /.pkg] + ... [default: $DEFAULT_VSERVERPKGDIR] cfg-options are: $SETUP_HELPMSG diff --git a/util-vserver/scripts/vserver-build.functions b/util-vserver/scripts/vserver-build.functions index bb7e9a8..6ac121e 100644 --- a/util-vserver/scripts/vserver-build.functions +++ b/util-vserver/scripts/vserver-build.functions @@ -73,7 +73,7 @@ function _setRootDir { test -z "$ROOTDIR" || return 0 - for item in "\"$CONFDIR/.defaults/vdirbase\" 1" "/vservers"; do + for item in "\"$CONFDIR/.defaults/vdirbase\" 1" "$DEFAULT_VSERVERDIR"; do eval set -- "$item" ROOTDIR=$1 ROOTDIR_REL=$2 @@ -90,7 +90,7 @@ function _setPkgCfgBase { test -z "$PKGCFGBASE" || return 0 - for item in "\"$CONFDIR/.defaults/apps/pkgmgmt/base\" 1" "$ROOTDIR/.pkg"; do + for item in "\"$CONFDIR/.defaults/apps/pkgmgmt/base\" 1" "$ROOTDIR/.pkg" "$DEFAULT_VSERVERPKGDIR"; do eval set -- "$item" PKGCFGBASE=$1 PKGCFGBASE_REL=$2