This commit is contained in:
committed by
Git OBS Bridge
parent
39a4f201bc
commit
759005f5a4
@@ -43,6 +43,7 @@ quiet = False
|
||||
verbose = False
|
||||
dryrun = False
|
||||
tmpdir = '/var/lib/xen/tmp'
|
||||
in_args = ''
|
||||
|
||||
# Helper functions
|
||||
|
||||
@@ -353,17 +354,17 @@ def copyKernelAndRamdisk(disk, vdev, kernel, ramdisk):
|
||||
|
||||
def main(argv):
|
||||
"Main routine: Parses options etc."
|
||||
global quiet, dryrun, verbose, tmpdir
|
||||
global quiet, dryrun, verbose, tmpdir, in_args
|
||||
def usage():
|
||||
"Help output (usage info)"
|
||||
global verbose, quiet, dryrun
|
||||
print >> sys.stderr, "domUloader usage: domUloader [--output=fd] [--quiet] [--dryrun] [--verbose]\n" +\
|
||||
"[--help] --entry=dev:kernel[,ramdisk] physdisk [virtdisk]\n"
|
||||
"[--args] [--help] --entry=dev:kernel[,ramdisk] physdisk [virtdisk]\n"
|
||||
print >> sys.stderr, __doc__
|
||||
|
||||
try:
|
||||
(optlist, args) = getopt.gnu_getopt(argv, 'qvh', \
|
||||
('entry=', 'output=', 'tmpdir=', 'help', 'quiet', 'dryrun', 'verbose'))
|
||||
('entry=', 'output=', 'tmpdir=', 'args=', 'help', 'quiet', 'dryrun', 'verbose'))
|
||||
except:
|
||||
usage()
|
||||
sys.exit(1)
|
||||
@@ -389,6 +390,8 @@ def main(argv):
|
||||
entry = oarg
|
||||
elif opt == '--tmpdir':
|
||||
tmpdir = oarg
|
||||
elif opt == '--args':
|
||||
in_args = oarg
|
||||
|
||||
verbose_print(str(argv))
|
||||
|
||||
@@ -424,6 +427,8 @@ def main(argv):
|
||||
r = 0
|
||||
try:
|
||||
sxpr = copyKernelAndRamdisk(disk, vdev, kernel, ramdisk)
|
||||
if in_args:
|
||||
sxpr += "(args %s)" % in_args
|
||||
os.write(fd, sxpr)
|
||||
except Exception, e:
|
||||
error(str(e))
|
||||
|
Reference in New Issue
Block a user