[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Default the global grub timeout to 5 for serial



Ack for f13-branch.

On Fri, 2010-04-30 at 11:36 -0700, Brian C. Lane wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 04/30/2010 10:54 AM, Jesse Keating wrote:
> > Just setting the terminal timeout doesn't seem to be enough.  This sets
> > the global time out if serial is in use.  Resolves #568106
> > ---
> >  booty/x86.py |    5 ++++-
> >  1 files changed, 4 insertions(+), 1 deletions(-)
> > 
> > diff --git a/booty/x86.py b/booty/x86.py
> > index 14bd641..89d6393 100644
> > --- a/booty/x86.py
> > +++ b/booty/x86.py
> > @@ -278,9 +278,10 @@ class x86BootloaderInfo(efiBootloaderInfo):
> >  
> >  
> >          f.write('default=%s\n' % (default))
> > -        f.write('timeout=%d\n' % (self.timeout or 0))
> >  
> >          if self.serial == 1:
> > +            # Set the global timeout in serial case
> > +            f.write('timeout=%d\n' % (self.timeout or 5))
> >              # grub the 0-based number of the serial console device
> >              unit = self.serialDevice[-1]
> >              
> > @@ -299,6 +300,8 @@ class x86BootloaderInfo(efiBootloaderInfo):
> >              f.write("serial --unit=%s --speed=%s\n" %(unit, speed))
> >              f.write("terminal --timeout=%s serial console\n" % (self.timeout or 5))
> >          else:
> > +            # Default to 0 timeout in the non-serial case
> > +            f.write('timeout=%d\n' % (self.timeout or 0))
> >              # we only want splashimage if they're not using a serial console
> >              if os.access("%s/boot/grub/splash.xpm.gz" %(instRoot,), os.R_OK):
> >                  f.write('splashimage=%s%sgrub/splash.xpm.gz\n'
> 
> Ack. I've tested this and it works, it now spits out 'press any key' on
> the serial console while waiting for a key.
> 
> dlehman, we want this on f13-branch as well as master.
> 
> - -- 
> Brian C. Lane <bcl redhat com>
> Red Hat / Port Orchard, WA
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
> 
> iQEVAwUBS9sjNxF+jBaO/jp/AQLAmQf+Lnshy5CsV6cDqH2XayzYSvs+2e16m3Lk
> 5qvuFaY0zMvu5YBJ8Qcx7XAZfkmSn7zIRUlv99wDezASmhPUH0zF+02Oh8B1vi8r
> FTJVZH6Dl8iX5NWiWcB5ddBUeerJVZkfJN7R5CwOiLUV6KlSx0Op14e8U+7M0UTy
> 6Hv+zkjOlnKypNKhPChJm0KMWseUOI9OpuGmKEmGJg4Y1f4SWJkUPqq7oGCgsiRX
> vkdWmEGa6EMRGGuEKnqV8nPAoB4sJwaHWLldsIiFrX8ROTPRg16ASggsDhvN1p8v
> HgrKJR6FmKm/nMFfcL4vdT3hmhMdUdnrsc/YXnwNxPIvYOWoEMGgeA==
> =HH5p
> -----END PGP SIGNATURE-----
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list redhat com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]