|
|
|
@ -289,6 +289,7 @@ class convertDictOpt:
|
|
|
|
|
"utf8":{"options":
|
|
|
|
|
re.compile("0|1|no|false|true|yes"),
|
|
|
|
|
"incompatible":["uni_xlate"]}},
|
|
|
|
|
"incompatible":[],
|
|
|
|
|
"makefs":"/usr/sbin/mkfs.vfat"},
|
|
|
|
|
"xfs":{"options":["allocsize", "attr2", "noattr2",
|
|
|
|
|
"barrier", "dmapi", "grpid",
|
|
|
|
@ -808,7 +809,7 @@ class cl_install(color_print):
|
|
|
|
|
# check specified devices
|
|
|
|
|
wrongDevices = list(set(usedDevicesOnlyDisks) - \
|
|
|
|
|
set(self.clVars.Get('os_disk_dev')))
|
|
|
|
|
wrongDevices = list(set(usedDevicesOnlySwap) - \
|
|
|
|
|
wrongDevices = wrongDevices + list(set(usedDevicesOnlySwap) - \
|
|
|
|
|
set(self.clVars.Get('os_disk_dev')+["none"]))
|
|
|
|
|
if wrongDevices:
|
|
|
|
|
self.printERROR(_("Incorrect device '%s'")%wrongDevices[0])
|
|
|
|
|