commit gfxboot

23 May 2006

Hello community,

here is the log from the commit of package gfxboot
checked in at Tue May 23 01:07:59 CEST 2006.

--------

--- arch/i386/gfxboot/gfxboot.changes	2006-05-15 15:53:07.000000000 +0200
+++ gfxboot/gfxboot.changes	2006-05-22 15:36:59.000000000 +0200
@@ -1,0 +2,8 @@
+Mon May 22 15:36:47 CEST 2006 - snwint@suse.de
+
+- add check to handle insufficient real mode handling in Xen on VMX
+  machines (#175473)
+- allow per menu entry memory checks via mem.min[<label>] and
+  mem.msg[<label>] in gfxboot.cfg
+
+-------------------------------------------------------------------

Old:
----
  gfxboot-3.2.27.tar.bz2

New:
----
  gfxboot-3.2.28.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gfxboot.spec ++++++
--- /var/tmp/diff_new_pack.ymbj1X/_old	2006-05-23 01:07:46.000000000 +0200
+++ /var/tmp/diff_new_pack.ymbj1X/_new	2006-05-23 01:07:46.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package gfxboot (Version 3.2.27)
+# spec file for package gfxboot (Version 3.2.28)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -17,10 +17,10 @@
 Obsoletes:      gfxboot-devel
 Autoreqprov:    on
 Summary:        Graphical Boot Logo for LILO and SYSLINUX
-Version:        3.2.27
+Version:        3.2.28
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         gfxboot-3.2.27.tar.bz2
+Source:         gfxboot-3.2.28.tar.bz2
 Source1:        NLD.tar.bz2
 Source2:        SLES.tar.bz2
 Source3:        SuSE.tar.bz2
@@ -58,6 +58,11 @@
 /usr/share/gfxboot
 
 %changelog -n gfxboot
+* Mon May 22 2006 - snwint@suse.de
+- add check to handle insufficient real mode handling in Xen on VMX
+  machines (#175473)
+- allow per menu entry memory checks via mem.min[<label>] and
+  mem.msg[<label>] in gfxboot.cfg
 * Mon May 15 2006 - snwint@suse.de
 - fix random memory corruption when trying to open a nonexistent
   file (#165846)

++++++ NLD.tar.bz2 ++++++

++++++ SLES.tar.bz2 ++++++

++++++ SuSE.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/common.inc new/themes/SuSE/common.inc
--- old/themes/SuSE/common.inc	2006-04-27 12:42:38.000000000 +0200
+++ new/themes/SuSE/common.inc	2006-05-22 15:33:25.000000000 +0200
@@ -66,8 +66,7 @@
 %
 /enough_mem {
   biosmem 4 20 shl lt
-  biosmem livecd.mem.check 20 shl ge or
-  syslinux not or
+  biosmem mem.check 20 shl ge or
 } def
 
 
@@ -214,6 +213,17 @@
     /window.action actNothing def
     /load_error false def
 
+    syslinux {
+      menu.texts menu.entry 0 max menu.texts length 1 sub min get
+      dup "mem.min[%s]" mem.min sprintf
+      "mem.msg[%s]" mem.msg sprintf
+
+      enough_mem not {
+        nomem_popup
+        boot.buf menu.entry 0 return
+      } if
+    } if
+
     % some tricks to make it possible to review the complete command line
     debug 3 ge xxx.cmdline .undef eq and {
       /window.action actNothing def
@@ -274,6 +284,8 @@
 
 
 /bc.cmd cmdlinelength string def
+/mem.min 128 string def
+/mem.msg 256 string def
 
 % ( option_string ) ==> ( cmdline menu_entry )
 %
@@ -542,23 +554,15 @@
       window.show
 
   syslinux {
-    enough_mem not livecd and {
-
-      notimeout nomem_popup
-
-    } {
-
-      32+64bit_source not {
-
-        64bit {
-          64bit_source not { notimeout 32bit_popup } if
-        } {
-          64bit_source { notimeout 64bit_popup } if
-        } ifelse
+    32+64bit_source not {
 
-      } if
+      64bit {
+        64bit_source not { notimeout 32bit_popup } if
+      } {
+        64bit_source { notimeout 64bit_popup } if
+      } ifelse
 
-    } ifelse
+    } if
   } if
 
 } def
@@ -1466,14 +1470,10 @@
 /nomem_popup {
   window.dialog
 
-  dup .title "Cool computer, but..." put
-  dup .text
-    livecd.mem.show
-    "Sorry, but SUSE Linux 10.1 LiveCD needs at least %dMB main memory."
-    dup length 32 add string dup 4 1 roll sprintf
-  put
+  dup .title "Sorry, but..." put
+  dup .text mem.show put
   dup .buttons [
-    button.reboot button.default actReboot actNoClose or button.setaction
+    button.ok button.default actNothing button.setaction
   ] put
   dup window.init
       window.show
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/system.inc new/themes/SuSE/system.inc
--- old/themes/SuSE/system.inc	2006-04-27 16:27:13.000000000 +0200
+++ new/themes/SuSE/system.inc	2006-05-22 15:20:41.000000000 +0200
@@ -805,23 +805,21 @@
 } def
 
 
-% Mininum Live-CD memory in MB.
+% Mininum required memory in MB.
 %
 % (  -- int )
 %
-/livecd.mem.check {
-  /livecd.mem.check "livecd.mem.check" getgfxconfig dup .undef ne { cvn } { pop 200 } ifelse def
-  livecd.mem.check
+/mem.check {
+  mem.min getgfxconfig dup .undef ne { cvn } { pop 0 } ifelse
 } def
 
 
-% Mininum Live-CD memory in MB we ask the user for.
+% Message to print if we fail minimum memory requirement.
 %
 % (  -- int )
 %
-/livecd.mem.show {
-  /livecd.mem.show "livecd.mem.show" getgfxconfig dup .undef ne { cvn } { pop 256 } ifelse def
-  livecd.mem.show
+/mem.show {
+  mem.msg getgfxconfig dup .undef eq { pop "Not enough memory." } if
 } def
 
 

++++++ gfxboot-3.2.27.tar.bz2 -> gfxboot-3.2.28.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.27/Changelog new/gfxboot-3.2.28/Changelog
--- old/gfxboot-3.2.27/Changelog	2006-05-15 15:51:42.000000000 +0200
+++ new/gfxboot-3.2.28/Changelog	2006-05-22 15:31:26.000000000 +0200
@@ -1,3 +1,9 @@
+22/5/2006:	v3.2.28
+	- add check to handle insufficient real mode handling in Xen on VMX
+	  machines (#175473)
+	- allow per menu entry memory checks via mem.min[<label>] and
+	  mem.msg[<label>] in gfxboot.cfg
+
 15/5/2006:	v3.2.27
 	- fix random memory corruption when trying to open a nonexistent
 	  file (#165846)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.27/VERSION new/gfxboot-3.2.28/VERSION
--- old/gfxboot-3.2.27/VERSION	2006-05-15 15:49:05.000000000 +0200
+++ new/gfxboot-3.2.28/VERSION	2006-05-22 10:07:25.000000000 +0200
@@ -1 +1 @@
-3.2.27
+3.2.28
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.27/bincode.asm new/gfxboot-3.2.28/bincode.asm
--- old/gfxboot-3.2.27/bincode.asm	2006-05-15 15:47:56.000000000 +0200
+++ new/gfxboot-3.2.28/bincode.asm	2006-05-22 10:10:33.000000000 +0200
@@ -629,6 +629,17 @@
 		test al,1		; in prot mode (maybe vm86)?
 		setz byte [pm_ok]
 
+		; xen currently can't handle real mode 4GB selectors on
+		; Intel VMX, so we do a quick check here whether it really
+		; works
+
+		xor eax,eax
+		lin2seg eax,es,eax
+		mov ax,es
+		call lin_seg_off
+		cmp ax,1		; xen will have returned 0 to match the base address
+		jc gfx_init_90
+
 		; init malloc memory chain
 
 		push dword [mem_free]


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)