|
@@ -65,14 +65,13 @@ Msg_NoSupportVERSION_ja(){
|
|
|
|
|
|
setup-vbuilder(){
|
|
|
## load default settings
|
|
|
- if [ -d /etc/vbootstrap/vbuilder.conf ]; then
|
|
|
+ if [ -r /etc/vbootstrap/vbuilder.conf ]; then
|
|
|
. /etc/vbootstrap/vbuilder.conf
|
|
|
- else
|
|
|
- [ -z "${VBOOTSTRAP_DIR}" ] && \
|
|
|
- VBOOTSTRAP_DIR=@@VBUILDER_VBOOTSTRAP_DIR@@
|
|
|
- [ -z "${DEFAULT_VERSION}" ] && \
|
|
|
- DEFAULT_VERSION=@@VBUILDER_DEFAULT_VERSION@@
|
|
|
fi
|
|
|
+ [ -z "${VBOOTSTRAP_DIR}" ] && \
|
|
|
+ VBOOTSTRAP_DIR=@@VBUILDER_VBOOTSTRAP_DIR@@
|
|
|
+ [ -z "${DEFAULT_VERSION}" ] && \
|
|
|
+ DEFAULT_VERSION=@@VBUILDER_DEFAULT_VERSION@@
|
|
|
[ -d $VBOOTSTRAP_DIR ] || mkdir -p $VBOOTSTRAP_DIR
|
|
|
VERSION=$DEFAULT_VERSION
|
|
|
|