/[smeserver]/rpms/booty/sme8/booty-0.80.4-bz464791-serial-init.patch
ViewVC logotype

Annotation of /rpms/booty/sme8/booty-0.80.4-bz464791-serial-init.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Apr 14 14:37:20 2009 UTC (15 years, 6 months ago) by slords
Branch: MAIN
CVS Tags: booty-0_80_6-10_el5_sme, booty-0_80_6-5, booty-0_80_6-5_el5_sme_1, booty-0_80_6-10, HEAD
CentOS 5.3 sources

1 slords 1.1 commit c777c0e9c5724cc0f8e0de7a443d9eb5001ef058
2     Author: Peter Jones <pjones@redhat.com>
3     Date: Tue Sep 30 12:00:59 2008 -0400
4    
5     Rework bootloaderInfo.serial's initialization (rhbz#464791)
6    
7     This should make sure self.serial is assigned before we try to use it...
8    
9     diff --git a/bootloaderInfo.py b/bootloaderInfo.py
10     index b7f2d2c..69a6495 100644
11     --- a/bootloaderInfo.py
12     +++ b/bootloaderInfo.py
13     @@ -499,6 +499,10 @@ class bootloaderInfo:
14    
15     self.updateDriveList()
16    
17     + self.serialDevice = None
18     + self.serialOptions = None
19     + self.serial = False
20     +
21     from flags import flags
22     if flags.serial != 0:
23     # now look at /proc/cmdline to pull any serial console
24     @@ -533,11 +537,7 @@ class bootloaderInfo:
25    
26     if self.serialDevice:
27     self.args.append("console=%s%s" %(self.serialDevice, options))
28     - self.serial = 1
29     - else:
30     - self.serial = 0
31     - self.serialDevice = None
32     - self.serialOptions = None
33     + self.serial = True
34    
35     if flags.virtpconsole is not None:
36     if flags.virtpconsole.startswith("/dev/"):
37     @@ -781,7 +781,7 @@ class x86BootloaderInfo(bootloaderInfo):
38     timeout = 5
39     f.write('timeout=%d\n' %(timeout,))
40    
41     - if self.serial == 1:
42     + if self.serial:
43     # grub the 0-based number of the serial console device
44     unit = self.serialDevice[-1]
45    
46     @@ -1032,7 +1032,7 @@ class x86BootloaderInfo(bootloaderInfo):
47     message = fn
48     break
49    
50     - if self.serial == 1:
51     + if self.serial:
52     # grab the 0-based number of the serial console device
53     unit = self.serialDevice[-1]
54     # FIXME: we should probably put some options, but lilo

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed