git://git.onelab.eu
/
infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no need to specify -f is -i is given
[infrastructure.git]
/
scripts
/
create-vm.sh
diff --git
a/scripts/create-vm.sh
b/scripts/create-vm.sh
index
43adf55
..
de6a005
100755
(executable)
--- a/
scripts/create-vm.sh
+++ b/
scripts/create-vm.sh
@@
-38,13
+38,14
@@
function usage () {
exit 1
}
exit 1
}
+# using HOSTNAME won't work as this is already set in environment
while getopts "cf:i:m:n:h" flag; do
case $flag in
c) CONFIRM=true ;;
f) DISTRO=$OPTARG ;;
i) IMAGE=$OPTARG ;;
m) MEMORY=$OPTARG ;;
while getopts "cf:i:m:n:h" flag; do
case $flag in
c) CONFIRM=true ;;
f) DISTRO=$OPTARG ;;
i) IMAGE=$OPTARG ;;
m) MEMORY=$OPTARG ;;
- n) HOSTNAME=$OPTARG ;;
+ n)
VM_
HOSTNAME=$OPTARG ;;
?|h) usage "" ;;
esac
done
?|h) usage "" ;;
esac
done
@@
-60,15
+61,14
@@
container="$1" ; shift
# comopute all vars from args
[ -z "$DISTRO" ] && DISTRO="$DEFAULT_DISTRO"
# comopute all vars from args
[ -z "$DISTRO" ] && DISTRO="$DEFAULT_DISTRO"
-[ -z "$
HOSTNAME" ] &&
HOSTNAME="$container"
-fqdn=$HOSTNAME.$DOMAIN
+[ -z "$
VM_HOSTNAME" ] && VM_
HOSTNAME="$container"
+fqdn=$
VM_
HOSTNAME.$DOMAIN
# prepare initvm command
initvm="$BUILD/lbuild-initvm.sh"
# prepare initvm command
initvm="$BUILD/lbuild-initvm.sh"
-
initvm="$initvm -f $DISTRO
"
+
[ -z "$IMAGE" ] && initvm="$initvm -f $DISTRO" || initvm="$initvm -i $IMAGE
"
initvm="$initvm -n $fqdn"
initvm="$initvm -n $fqdn"
-[ -n "$IMAGE" ] && initvm="$initvm -i $IMAGE"
-[ -n "$MEMORY" ] $$ initvm="$initvm -m $MEMORY"
+[ -n "$MEMORY" ] && initvm="$initvm -m $MEMORY"
initvm="$initvm $container"
if [ -n "$CONFIRM" ] ; then
initvm="$initvm $container"
if [ -n "$CONFIRM" ] ; then