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
c8c26c7
..
de6a005
100755
(executable)
--- a/
scripts/create-vm.sh
+++ b/
scripts/create-vm.sh
@@
-66,9
+66,8
@@
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"
initvm="$initvm $container"
[ -n "$MEMORY" ] && initvm="$initvm -m $MEMORY"
initvm="$initvm $container"