shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-03-08 04:58:29 +03:00
Code Issues Projects Releases Wiki Activity

guest: Rename noboot -> doboot

Browse Source 
It's a bit easier to follow the logic IMO
This commit is contained in:
Cole Robinson 2016-06-17 08:27:26 -04:00
parent b5d0b381ba
commit 59edd87e9f
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virt-install
View File

@ -727,7 +727,7 @@ def start_install(guest, options):
start_time = time.time()
# Do first install phase
dom = guest.start_install(meter=meter, noboot=options.noreboot)
dom = guest.start_install(meter=meter, doboot=not options.noreboot)
cli.connect_console(guest, conscb, wait_on_console)
dom = check_domain(guest, dom, conscb,
wait_on_install, wait_time, start_time)

33
virtinst/guest.py
View File

@ -372,13 +372,6 @@ class Guest(XMLBuilder):
# Private install helpers #
###########################
def _build_meter(self, meter):
meter_label = _("Creating domain...")
meter = util.ensure_meter(meter)
meter.start(size=None, text=meter_label)
return meter
def _build_xml(self):
install_xml = self._get_install_xml(install=True)
final_xml = self._get_install_xml(install=False)
@ -389,27 +382,25 @@ class Guest(XMLBuilder):
return install_xml, final_xml
def _create_guest(self, meter, install_xml, final_xml, noboot):
def _create_guest(self, meter, install_xml, final_xml, doboot):
"""
Actually do the XML logging, guest defining/creating
@param noboot: Don't boot guest if no install phase
@param doboot: Boot guest even if it has no install phase
"""
meter = self._build_meter(meter)
doboot = not noboot or self.installer.has_install_phase()
meter_label = _("Creating domain...")
meter = util.ensure_meter(meter)
meter.start(size=None, text=meter_label)
if doboot:
dom = self.conn.createXML(install_xml or final_xml, 0)
else:
dom = self.conn.defineXML(install_xml or final_xml)
self.domain = dom
meter.end(0)
if doboot or self.installer.has_install_phase():
self.domain = self.conn.createXML(install_xml or final_xml, 0)
self.domain = self.conn.defineXML(final_xml)
meter.end(0)
try:
logging.debug("XML fetched from libvirt object:\n%s",
dom.XMLDesc(0))
self.domain.XMLDesc(0))
except Exception, e:
logging.debug("Error fetching XML from libvirt object: %s", e)
@ -439,7 +430,7 @@ class Guest(XMLBuilder):
##############
def start_install(self, meter=None,
dry=False, return_xml=False, noboot=False):
dry=False, return_xml=False, doboot=True):
"""
Begin the guest install (stage1).
@param return_xml: Don't create the guest, just return generated XML
@ -467,7 +458,7 @@ class Guest(XMLBuilder):
do_remove=self.replace)
self.domain = self._create_guest(meter, install_xml, final_xml,
noboot)
doboot)
# Set domain autostart flag if requested
self._flag_autostart()