Fix bug of specifing wrong device by '-d' option.

Fix vfat params.
netsetup
Mike Hiretsky 14 years ago
parent 92ab04b191
commit 569d369bd1

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

Loading…
Cancel
Save