updated vbuilder.sh.in: added 29528UNIONFS_DIR

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

Makefile

@@ -6,7 +6,7 @@ VBUILDER_STABLE_VERSION=5.2
 VBUILDER_DEFAULT_VERSION=VineSeed
 VBUILDER_CATEGORIES=main,plus,nonfree
 VBUILDER_VBOOTSTRAP_DIR=/var/local/vbootstrap
-#VBUILDER_CACHE_DIR=$$\{VBOOTSTRAP_DIR\}/cache
+VBUILDER_UNIONFS_DIR=/var/local/vbootstrap/unionfs
 VBUILDER_CACHE_DIR=/var/local/vbootstrap/cache
 VBUILDER_BUILT_RPMS_DIR=$$\{HOME\}/rpm/vbuilder
 

vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.37
+%define version 0.0.38
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -80,6 +80,10 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Fri Feb 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.38-1
+- updated vbuilder.sh.in
+  - added $$UNIONFS_DIR
+
 * Wed Feb 09 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.37-1
 - fixed a little mistake of vbuilder.sh.in
 - supported --unionfs for RPM_Sign()

vbuilder.conf.in

@@ -15,6 +15,10 @@ CATEGORIES=@@VBUILDER_CATEGORIES@@
 ## default: VBOOTSTRAP_DIR=@@VBUILDER_VBOOTSTRAP_DIR@@
 VBOOTSTRAP_DIR=@@VBUILDER_VBOOTSTRAP_DIR@@
 
+## Default directory to store unionfs images of vbootstrap
+## default: CACHE_DIR=@@VBUILDER_UNIONFS_DIR@@
+UNIONFS_DIR=@@VBUILDER_UNIONFS_DIR@@
+
 ## Default directory to cache rpms of /var/cache/apt/archives in chroot
 ## default: CACHE_DIR=@@VBUILDER_CACHE_DIR@@
 CACHE_DIR=@@VBUILDER_CACHE_DIR@@

vbuilder.sh.in

@@ -22,6 +22,7 @@ Options:
 	--sign:			sign built rpms
 	--no-install:		build only a source rpm - do NOT install a built rpm
 	--bootstrap-dir:	set a bootstrap directory (default: ${VBOOTSTRAP_DIR})
+	--unionfs-dir:		set a directory to store unionfs images of vbootstrap (default: ${UNIONFS_DIR})
 	--cache-dir:		set a directory to cache rpms (default: ${CACHE_DIR})
 	--built-rpms-dir:	set a directory to store built rpms in chroot (default: ${BUILT_RPMS_DIR})
 
@@ -61,7 +62,7 @@ check-parameter(){
 		Usage
 		return 1
 		;;
-	    --version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--cache-dir|--built-rpms-dir)
+	    --version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--unionfs-dir|--cache-dir|--built-rpms-dir)
 		[ $with_actions -eq 1 ] && \
 		    echo $"E: You can give no more options after actions" && \
 		    return 1
@@ -117,6 +118,8 @@ setup-vbuilder(){
 	CATEGORIES=@@VBUILDER_CATEGORIES@@
     [ -z "${VBOOTSTRAP_DIR}" ] && \
 	VBOOTSTRAP_DIR=@@VBUILDER_VBOOTSTRAP_DIR@@
+    [ -z "${UNIONFS_DIR}" ] && \
+	UNIONFS_DIR=@@VBUILDER_UNIONFS_DIR@@
     [ -z "${CACHE_DIR}" ] && \
 	CACHE_DIR=@@VBUILDER_CACHE_DIR@@
     [ -z "${BUILT_RPMS_DIR}" ] && \
@@ -258,7 +261,7 @@ setup-vbootstrap(){
     BUILD_ROOT=${VBOOTSTRAP_DIR}/${VERSION}
     BUILD_USER=vbuilder
     BUILD_DIR=/home/${BUILD_USER}/rpm
-    UNIONFS_DIR=${VBOOTSTRAP_DIR}/unionfs/${VERSION}
+    UNIONFS_ROOT=${UNIONFS_DIR}/${VERSION}
     ARCHIVES_DIR=${BUILD_ROOT}/var/cache/apt/archives
     EXTERNAL_ARCHIVES_DIR=${CACHE_DIR}/${VERSION}/apt/archives
     VBUILDER_LOG=${BUILD_ROOT}/var/log/vbuilder.log
@@ -407,9 +410,9 @@ mount-chroot-mount(){
 	    ;;
 	unionfs_dir)
 	    if [ $with_unionfs -eq 1 ]; then
-		[ -d ${UNIONFS_DIR} ] || mkdir -p ${UNIONFS_DIR}
+		[ -d ${UNIONFS_ROOT} ] || mkdir -p ${UNIONFS_ROOT}
 		[ -z "$(mount | grep ${BUILD_ROOT})" ] && \
-		    mount -t unionfs -o dirs=${UNIONFS_DIR}=rw:${BUILD_ROOT}=ro unionfs ${BUILD_ROOT}
+		    mount -t unionfs -o dirs=${UNIONFS_ROOT}=rw:${BUILD_ROOT}=ro unionfs ${BUILD_ROOT}
 		unionctl ${BUILD_ROOT} --list
 	    fi
 	    ;;
@@ -442,6 +445,7 @@ $(echo $([ $with_dist_upgrade -eq 1 ] && echo "--dist-upgrade"))
 $(echo $([ $with_unionfs -eq 1 ] && echo "--unionfs"))
 $(echo $([ -z "${TARGET}" ] || echo "--target: ${TARGET}"))
 --bootstrap-dir: ${VBOOTSTRAP_DIR}
+--unionfs-dir: ${UNIONFS_DIR}
 --cache-dir: ${CACHE_DIR}
 --built-rpms-dir: ${BUILT_RPMS_DIR}
 ${HRULE}
@@ -493,9 +497,9 @@ Clean(){
     apt-get-update --host
 
     if [ $with_unionfs -eq 1 ]; then
-	if [ -d ${UNIONFS_DIR} ]; then
+	if [ -d ${UNIONFS_ROOT} ]; then
-	    echo -n $"Cleaning build root ${UNIONFS_DIR} via unionfs ... "
+	    echo -n $"Cleaning build root ${UNIONFS_ROOT} via unionfs ... "
-	    rm -rf ${UNIONFS_DIR}
+	    rm -rf ${UNIONFS_ROOT}
 	    echo $"done."
 	fi
     else
@@ -738,7 +742,7 @@ check-parameter $* || exit 1
 while [ $# -gt 0 ]; do
     tmpARG=$1
     case $tmpARG in
-	--version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--cache-dir|--built-rpms-dir)
+	--version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--unionfs-dir|--cache-dir|--built-rpms-dir)
 	    shift
 	    ;;
 	--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install)
@@ -795,6 +799,9 @@ while [ $# -gt 0 ]; do
 	--bootstrap-dir)
 	    VBOOTSTRAP_DIR=$1
 	    ;;
+	--unionfs-dir)
+	    UNIONFS_DIR=$1
+	    ;;
 	--cache-dir)
 	    CACHE_DIR=$1
 	    ;;