DEFAULT_VERSION を廃止

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@5368 ec354946-7b23-47d6-9f5a-488ba84defc7

vbuilder.conf.in

@@ -3,10 +3,6 @@
 ## 
 ## This configuration is read at the begin of vbuilder. 
 
-## Default version for chroot
-## default: DEFAULT_VERSION=@@VBUILDER_DEFAULT_VERSION@@
-DEFAULT_VERSION=@@VBUILDER_DEFAULT_VERSION@@
-
 ## Default categories for chroot
 ## default: CATEGORIES=@@VBUILDER_CATEGORIES@@
 CATEGORIES=@@VBUILDER_CATEGORIES@@

vbuilder.sh.in

@@ -173,8 +173,6 @@ setup-vbuilder(){
 	. $VBUILDER_CONF
 	[ $? -eq 1 ] && return 1
     fi
-    [ -z "${DEFAULT_VERSION}" ] && \
-	DEFAULT_VERSION=@@VBUILDER_DEFAULT_VERSION@@
     [ -z "${CATEGORIES}" ] && \
 	CATEGORIES=@@VBUILDER_CATEGORIES@@
     [ -z "${VBOOTSTRAP_FETCH_URL}" ] && \
@@ -188,6 +186,9 @@ setup-vbuilder(){
     [ -z "${BUILT_RPMS_DIR}" ] && \
 	BUILT_RPMS_DIR=@@VBUILDER_BUILT_RPMS_DIR@@
 
+    ## set default version for vbootstrap
+    VERSION=@@VBUILDER_DEFAULT_VERSION@@
+
     ## load profile
     if [ ${with_profile} -eq 1 ]; then
 	[ ! -r /etc/vbootstrap/profile.d/${PROFILE}.conf ] && \
@@ -197,13 +198,6 @@ setup-vbuilder(){
 	[ $? -eq 1 ] && return 1
     fi
 
-    ## set default version for vbootstrap
-    if [ ${with_profile} -eq 1 ]; then
-	[ -z ${VERSION} ] && VERSION=$DEFAULT_VERSION
-    else
-	VERSION=$DEFAULT_VERSION
-    fi
-
     ## set current stable relase version
     STABLE_VERSION=@@VBUILDER_STABLE_VERSION@@