commit c777c0e9c5724cc0f8e0de7a443d9eb5001ef058 Author: Peter Jones Date: Tue Sep 30 12:00:59 2008 -0400 Rework bootloaderInfo.serial's initialization (rhbz#464791) This should make sure self.serial is assigned before we try to use it... diff --git a/bootloaderInfo.py b/bootloaderInfo.py index b7f2d2c..69a6495 100644 --- a/bootloaderInfo.py +++ b/bootloaderInfo.py @@ -499,6 +499,10 @@ class bootloaderInfo: self.updateDriveList() + self.serialDevice = None + self.serialOptions = None + self.serial = False + from flags import flags if flags.serial != 0: # now look at /proc/cmdline to pull any serial console @@ -533,11 +537,7 @@ class bootloaderInfo: if self.serialDevice: self.args.append("console=%s%s" %(self.serialDevice, options)) - self.serial = 1 - else: - self.serial = 0 - self.serialDevice = None - self.serialOptions = None + self.serial = True if flags.virtpconsole is not None: if flags.virtpconsole.startswith("/dev/"): @@ -781,7 +781,7 @@ class x86BootloaderInfo(bootloaderInfo): timeout = 5 f.write('timeout=%d\n' %(timeout,)) - if self.serial == 1: + if self.serial: # grub the 0-based number of the serial console device unit = self.serialDevice[-1] @@ -1032,7 +1032,7 @@ class x86BootloaderInfo(bootloaderInfo): message = fn break - if self.serial == 1: + if self.serial: # grab the 0-based number of the serial console device unit = self.serialDevice[-1] # FIXME: we should probably put some options, but lilo