← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-updates

« back to all changes in this revision

Viewing changes to virt-install

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
virt-install
492
492
    # Non-default devices
493
493
    cli.get_controller(guest, options.controller)
494
494
    cli.get_redirdev(guest, options.redirdev)
 
495
    cli.get_memballoon(guest, options.memballoon)
495
496
    if not options.nonetworks:
496
497
        get_networks(guest, options)
497
498
    get_graphics(guest, options)
968
969
# main() handling #
969
970
###################
970
971
 
971
 
def main():
 
972
def main(conn=None):
972
973
    cli.earlyLogging()
973
974
    options, cliargs = parse_args()
974
975
 
975
976
    # Default setup options
976
977
    options.quiet = options.xmlstep or options.xmlonly or options.quiet
 
978
 
977
979
    cli.setupLogging("virt-install", options.debug, options.quiet)
 
980
 
978
981
    if cliargs:
979
982
        fail(_("Unknown argument '%s'") % cliargs[0])
980
983
 
985
988
 
986
989
    cli.set_force(options.force)
987
990
    cli.set_prompt(options.prompt)
988
 
    conn = cli.getConnection(options.connect)
 
991
 
 
992
    if conn is None:
 
993
        conn = cli.getConnection(options.connect)
989
994
 
990
995
    if options.xmlstep not in [None, "1", "2", "3", "all"]:
991
996
        fail(_("--print-step must be 1, 2, 3, or all"))