Mailinglist Archive: opensuse-commit (689 mails)
| < Previous | Next > |
commit grub
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 07 Dec 2007 20:11:15 +0100
- Message-id: <20071207191116.0C787678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package grub
checked in at Fri Dec 7 20:11:15 CET 2007.
--------
--- arch/i386/grub/grub.changes 2007-10-31 17:18:29.000000000 +0100
+++ /mounts/work_src_done/STABLE/grub/grub.changes 2007-12-07
17:04:41.787007000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 7 17:04:14 CET 2007 - bwalle@xxxxxxx
+
+- don't wait for a keypress when multiple terminals are specified
+ but grubonce was called previously
+
+-------------------------------------------------------------------
New:
----
grub-grunonce-no-wait
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub.spec ++++++
--- /var/tmp/diff_new_pack.w24751/_old 2007-12-07 20:10:00.000000000 +0100
+++ /var/tmp/diff_new_pack.w24751/_new 2007-12-07 20:10:00.000000000 +0100
@@ -18,7 +18,7 @@
License: GPL v2 or later
Group: System/Boot
Version: 0.97
-Release: 86
+Release: 93
Source0: %{name}-%{version}.tar.gz
Source1: installgrub
Source2: grubonce
@@ -47,6 +47,7 @@
Patch23: stage2-wildcard-doc.diff
Patch24: grub-%{version}-protexec.patch
Patch25: pacify-autoconf
+Patch26: grub-grunonce-no-wait
Url: http://www.gnu.org/software/grub/grub.en.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Grand Unified Boot Loader
@@ -107,6 +108,7 @@
#%patch23 -p1
%patch24 -p1
%patch25 -p1
+%patch26 -p1
%build
perl -pi -e 's,/usr/share/grub/i386-pc,/usr/lib/grub,' docs/grub.texi
@@ -197,7 +199,11 @@
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/multiboot.info.gz
exit 0
+
%changelog
+* Fri Dec 07 2007 - bwalle@xxxxxxx
+- don't wait for a keypress when multiple terminals are specified
+ but grubonce was called previously
* Wed Oct 31 2007 - snwint@xxxxxxx
- make 'savedefault' work with gfxmenu (#249812)
* Thu Aug 23 2007 - duwe@xxxxxxx
++++++ grub-grunonce-no-wait ++++++
---
stage2/builtins.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -4259,7 +4259,7 @@ terminal_func (char *arg, int flags)
/* If multiple terminals are specified, wait until the user pushes any
key on one of the terminals. */
- if (term_bitmap & ~(1 << default_term))
+ if ((term_bitmap & ~(1 << default_term)) && !(saved_entryno & 0x4000))
{
int time1, time2 = -1;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |