Author: eelco
Date: Tue May 10 13:37:32 2011
New Revision: 27213
URL: https://svn.nixos.org/websvn/nix/?rev=27213&sc=1

Log:


Modified:
   configurations/trunk/tud/cloud/scripts/create-vm

Modified: configurations/trunk/tud/cloud/scripts/create-vm
==============================================================================
--- configurations/trunk/tud/cloud/scripts/create-vm    Tue May 10 13:37:14 
2011        (r27212)
+++ configurations/trunk/tud/cloud/scripts/create-vm    Tue May 10 13:37:32 
2011        (r27213)
@@ -7,10 +7,7 @@
 # Assign a number to the VM.  From this we derive the MAC and IPv6 addresses.
 lastnr=$(flock -x /vmdisks/adhoc-cloud/lock -c 'lastnr=$(cat 
/vmdisks/adhoc-cloud/last-nr || echo 65536); lastnr=$(($lastnr + 1)); echo 
$lastnr; echo $lastnr > /vmdisks/adhoc-cloud/last-nr')
 
-# If no id is given, use the number.
-if [ -z "$id" ]; then
-    id="i-$lastnr"
-fi
+id="i-$lastnr${id:+-$id}"
 
 xml=/vmdisks/adhoc-cloud/"$id".xml
 image=/vmdisks/adhoc-cloud/"$id".qcow2
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to