|
|
|
@ -2362,7 +2362,7 @@ class VariableOsInstallDiskSingle(Variable):
|
|
|
|
|
'os_disk_dev', 'os_disk_type', 'os_disk_parent'):
|
|
|
|
|
if disk_type == "disk-partition":
|
|
|
|
|
device_name = device_names.get(disk_parent, _("Unknown"))
|
|
|
|
|
yield disk_dev, device_name
|
|
|
|
|
yield disk_dev, "%s (%s)" % (disk_dev, device_name)
|
|
|
|
|
return list(generator())
|
|
|
|
|
|
|
|
|
|
def check(self, value):
|
|
|
|
@ -2371,6 +2371,10 @@ class VariableOsInstallDiskSingle(Variable):
|
|
|
|
|
raise VariableError(
|
|
|
|
|
_("Wrong device '%s'" % value)
|
|
|
|
|
)
|
|
|
|
|
disktype = self.select('os_disk_type', os_disk_dev=value, limit=1)
|
|
|
|
|
if disktype and disktype != "disk-partition":
|
|
|
|
|
raise VariableError(
|
|
|
|
|
_("Wrong device '%s'" % value))
|
|
|
|
|
# проверить, чтобы раздел не использовался системой (не описан в fstab)
|
|
|
|
|
mp = self.select('os_disk_mount', os_disk_dev=value, limit=1)
|
|
|
|
|
if mp:
|
|
|
|
@ -2393,7 +2397,7 @@ class VariableOsInstallDiskSingle(Variable):
|
|
|
|
|
if "cdrom" in disk_part:
|
|
|
|
|
raise VariableError(_("Unable to use CDROM %s for installation") %
|
|
|
|
|
value)
|
|
|
|
|
if disk_part == 'gpt':
|
|
|
|
|
if not disk_part or disk_part == 'gpt':
|
|
|
|
|
raise VariableError(_("You need a disk with a dos "
|
|
|
|
|
"table for Flash install"))
|
|
|
|
|
|
|
|
|
|