projects
/
invirt/packages/invirt-remote.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow "preseed" as a valid installation option.
[invirt/packages/invirt-remote.git]
/
server
/
usr
/
sbin
/
invirt-remote-create
diff --git
a/server/usr/sbin/invirt-remote-create
b/server/usr/sbin/invirt-remote-create
index
add3113
..
9f5817a
100755
(executable)
--- a/
server/usr/sbin/invirt-remote-create
+++ b/
server/usr/sbin/invirt-remote-create
@@
-42,7
+42,7
@@
def main(argv):
if operation == 'install':
options = dict(arg.split('=', 1) for arg in args)
if operation == 'install':
options = dict(arg.split('=', 1) for arg in args)
- valid_keys = set(('mirror', 'dist', 'arch', 'imagesize', 'noinstall'))
+ valid_keys = set(('mirror', 'dist', 'arch', 'imagesize', 'noinstall', 'preseed'))
if not set(options.keys()).issubset(valid_keys):
print >> sys.stderr, "Invalid argument. Use the help command to see valid arguments to install"
return 1
if not set(options.keys()).issubset(valid_keys):
print >> sys.stderr, "Invalid argument. Use the help command to see valid arguments to install"
return 1
@@
-71,7
+71,7
@@
def main(argv):
max_memory = maxMemory(owner, vms.keys())
if vm_memory > max_memory:
max_memory = maxMemory(owner, vms.keys())
if vm_memory > max_memory:
- print >>sys.stderr, "owner %s requested %d MB of memory for vm %s; %d MB allowed" % (owner, vm_memory, machine_name, max_memory)
+ print >>sys.stderr, "owner %s requested %d MiB of memory for vm %s; %d MiB allowed" % (owner, vm_memory, machine_name, max_memory)
return 1
host = choose_host()
return 1
host = choose_host()