devicedisk: Drop transient parameter

Just patch it in from distroinstaller
This commit is contained in:
Cole Robinson 2014-12-05 20:28:32 -05:00
parent 40a5ec75b7
commit 92663eb1de
3 changed files with 5 additions and 4 deletions

View File

@ -486,7 +486,6 @@ class VirtualDisk(VirtualDevice):
self._storage_creator = None
self.nomanaged = False
self.transient = False
#############################

View File

@ -632,13 +632,15 @@ class Guest(XMLBuilder):
# But only if we are a distro that doesn't have a multi
# stage install (aka not Windows)
return (d.is_cdrom() and
d.transient and
getattr(d, "installer_media", False) and
not install and
not self.get_continue_inst())
def do_skip_disk(d):
# Skip transient labeled non-media disks
return (d.is_disk() and d.transient and not install)
return (d.is_disk() and
getattr(d, "installer_media", False) and
not install)
for dev in self.get_devices("disk"):
if do_skip_disk(dev):

View File

@ -107,7 +107,7 @@ class Installer(object):
dev.path = path
dev.device = dev.DEVICE_CDROM
dev.read_only = True
dev.transient = transient
setattr(dev, "installer_media", transient)
dev.validate()
return dev