Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at Mon Sep 21 21:02:45 CEST 2009. -------- --- gfxboot/gfxboot.changes 2009-09-15 17:19:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/gfxboot/gfxboot.changes 2009-09-18 14:24:34.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 18 14:24:24 CEST 2009 - snwint@suse.de + +- F-key assignments configurable via gfxboot.cfg + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gfxboot-4.1.24.tar.bz2 New: ---- gfxboot-4.1.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.Rb9wY4/_old 2009-09-21 21:02:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Rb9wY4/_new 2009-09-21 21:02:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 4.1.24) +# spec file for package gfxboot (Version 4.1.25) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,10 +27,10 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.1.24 +Version: 4.1.25 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.1.24.tar.bz2 +Source: gfxboot-4.1.25.tar.bz2 Source1: openSUSE.tar.bz2 Source2: SLED.tar.bz2 Source3: SLES.tar.bz2 ++++++ SLED.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/SLED/data-boot/gfxboot.cfg new/themes/SLED/data-boot/gfxboot.cfg --- old/themes/SLED/data-boot/gfxboot.cfg 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/SLED/data-boot/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=SLED -; other sections to read -layout=800x600,boot -; penguin theme likelihood (in percent, -1 = auto) -penguin=0 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=100 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x217b05 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=0 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/SLED/data-install/gfxboot.cfg new/themes/SLED/data-install/gfxboot.cfg --- old/themes/SLED/data-install/gfxboot.cfg 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/SLED/data-install/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=SLED -; other sections to read -layout=800x600,install -; penguin theme likelihood (in percent, -1 = auto) -penguin=0 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=100 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x217b05 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=1 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 - ++++++ SLES.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/SLES/data-boot/gfxboot.cfg new/themes/SLES/data-boot/gfxboot.cfg --- old/themes/SLES/data-boot/gfxboot.cfg 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/SLES/data-boot/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=SLES -; other sections to read -layout=800x600,boot -; penguin theme likelihood (in percent, -1 = auto) -penguin=0 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=100 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x217b05 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=0 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/SLES/data-install/gfxboot.cfg new/themes/SLES/data-install/gfxboot.cfg --- old/themes/SLES/data-install/gfxboot.cfg 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/SLES/data-install/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=SLES -; other sections to read -layout=800x600,install -; penguin theme likelihood (in percent, -1 = auto) -penguin=0 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=100 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x217b05 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=1 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 - ++++++ gfxboot-4.1.24.tar.bz2 -> gfxboot-4.1.25.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.24/Changelog new/gfxboot-4.1.25/Changelog --- old/gfxboot-4.1.24/Changelog 2009-09-15 17:13:56.000000000 +0200 +++ new/gfxboot-4.1.25/Changelog 2009-09-18 14:23:04.000000000 +0200 @@ -1,3 +1,6 @@ +18/9/2009: v4.1.25 + - F-key assignments configurable via gfxboot.cfg + 15/9/2009: v4.1.24 - added proxy setup (bnc #329668) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.24/VERSION new/gfxboot-4.1.25/VERSION --- old/gfxboot-4.1.24/VERSION 2009-09-15 17:13:22.000000000 +0200 +++ new/gfxboot-4.1.25/VERSION 2009-09-18 14:21:32.000000000 +0200 @@ -1 +1 @@ -4.1.24 +4.1.25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.24/bincode.asm new/gfxboot-4.1.25/bincode.asm --- old/gfxboot-4.1.24/bincode.asm 2009-09-09 16:34:04.000000000 +0200 +++ new/gfxboot-4.1.25/bincode.asm 2009-09-18 13:29:32.000000000 +0200 @@ -15941,7 +15941,7 @@ call dword jpeg_decode - add sp,28 + add esp,28 jpg_unpack_90: pop fs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.1.24/gfxtest new/gfxboot-4.1.25/gfxtest --- old/gfxboot-4.1.24/gfxtest 2009-07-08 11:43:30.000000000 +0200 +++ new/gfxboot-4.1.25/gfxtest 2009-09-16 14:59:23.000000000 +0200 @@ -63,6 +63,7 @@ Options: -h, --help Write this help text. + -m, --make Force rebuilding the theme. --type TYPE Bootlogo type. Either boot or install. --disk N Switch to disk N. -l, --lang LANG Set default language to LANG. @@ -82,7 +83,7 @@ test_dir=test -OPTS=`getopt -n gfxtest -o hl:t: --long help,disk:,lang:,vm:,type:,32,64,theme:,lilo:,grub:,syslinux:,isolinux: -- "$@"` +OPTS=`getopt -n gfxtest -o mhl:t: --long make,help,disk:,lang:,vm:,type:,32,64,theme:,lilo:,grub:,syslinux:,isolinux: -- "$@"` if [ $? != 0 ] ; then echo "See 'gfxtest --help' for usage instructions." exit 1 @@ -97,6 +98,7 @@ --disk) opt_disk="$2" ; shift 2 ;; -l|--lang) gfxboot_args="$gfxboot_args --default-language $2" ; shift 2 ;; -t|--theme) opt_theme="$2" ; shift 2 ;; + -m|--make) opt_make='-B' ; shift ;; --vm) gfxboot_args="$gfxboot_args --vm $2" ; shift 2 ;; --32) opt_32=1 ; shift ;; --64) opt_64=1 ; shift ;; @@ -140,12 +142,14 @@ add_files=`echo $test_dir/$what/*` +[ -x gfxboot-compile ] || make + [ -x gfxboot-compile ] || { echo "error: gfxboot-compile missing. Run 'make' first." exit 2 } -make -C themes/$opt_theme || exit +make $opt_make -C themes/$opt_theme || exit if [ ! -f "$opt_archive" ] ; then echo "gfxboot archive missing: $opt_archive" ++++++ openSUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/Makefile new/themes/openSUSE/Makefile --- old/themes/openSUSE/Makefile 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/openSUSE/Makefile 2009-09-16 15:40:58.000000000 +0200 @@ -13,6 +13,8 @@ SUBDIRS = fonts help-boot help-install po src +THEME = $(shell basename `pwd`) + DEFAULT_LANG = .PHONY: all clean distclean themes $(SUBDIRS) @@ -39,9 +41,11 @@ src/main.bin: src make -C src -bootlogo: src/main.bin help-install/.ready po/.ready fonts/.ready +bootlogo: src/main.bin src/gfxboot.cfg help-install/.ready po/.ready fonts/.ready @rm -rf bootlogo.dir @mkdir bootlogo.dir + perl -p -e 's/^(layout=.*)/$$1,install/' src/gfxboot.cfg >bootlogo.dir/gfxboot.cfg + perl -pi -e 's/^(theme=).*/$$1$(THEME)/' bootlogo.dir/gfxboot.cfg cp -rL data-install/* fonts/*.fnt po/*.tr bootlogo.dir cp -rL help-install/*.hlp bootlogo.dir cp src/main.bin bootlogo.dir/init @@ -51,9 +55,11 @@ @sh -c 'cd bootlogo.dir; chmod +t * ; chmod -t init languages' @sh -c 'cd bootlogo.dir; echo * | sed -e "s/ /\n/g" | cpio --quiet -o >../bootlogo' -message: src/main.bin help-boot/.ready po/.ready fonts/.ready +message: src/main.bin src/gfxboot.cfg help-boot/.ready po/.ready fonts/.ready @rm -rf message.dir @mkdir message.dir + perl -p -e 's/^(layout=.*)/$$1,boot/' src/gfxboot.cfg >message.dir/gfxboot.cfg + perl -pi -e 's/^(theme=).*/$$1$(THEME)/' message.dir/gfxboot.cfg cp -rL data-boot/* fonts/*.fnt message.dir cp -rL po/en.tr help-boot/en.hlp message.dir cp src/main.bin message.dir/init diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/data-boot/gfxboot.cfg new/themes/openSUSE/data-boot/gfxboot.cfg --- old/themes/openSUSE/data-boot/gfxboot.cfg 2009-09-14 14:28:08.000000000 +0200 +++ new/themes/openSUSE/data-boot/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=openSUSE -; other sections to read -layout=800x600,boot -; penguin theme likelihood (in percent, -1 = auto) -penguin=-1 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=100 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x217b05 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=150 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=0 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 -; system restore menu entry -restore.title= - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/data-install/gfxboot.cfg new/themes/openSUSE/data-install/gfxboot.cfg --- old/themes/openSUSE/data-install/gfxboot.cfg 2009-09-14 14:25:07.000000000 +0200 +++ new/themes/openSUSE/data-install/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=openSUSE -; other sections to read -layout=800x600,install -; penguin theme likelihood (in percent, -1 = auto) -penguin=-1 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=150 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x217b05 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=1 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/common.inc new/themes/openSUSE/src/common.inc --- old/themes/openSUSE/src/common.inc 2009-09-15 16:58:51.000000000 +0200 +++ new/themes/openSUSE/src/common.inc 2009-09-18 14:11:20.000000000 +0200 @@ -218,7 +218,7 @@ /window.action actNothing def /load_error false def - syslinux { + config.memcheck { 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 @@ -246,9 +246,11 @@ dia .ed.focus 0 put dia .ed.width 600 put dia .ed.font font.normal put - dia .buttons - [ button.ok button.default actStart button.setaction ] - put + dia .buttons [ + button.ok button.default actStart button.setaction + button.cancel button.notdefault /xxx.cancel button.setaction + config.rtl { exch } if + ] put dia window.init dia window.show @@ -290,6 +292,12 @@ } def +/xxx.cancel { + /xxx.cmdline .undef def + actNothing +} def + + /bc.cmd cmdlinelength string def /mem.min 128 string def /mem.msg 256 string def @@ -354,18 +362,20 @@ menu.texts menu.entry get "%s " bc.cmd sprintf } ifelse - syslinux { - /splash_file 32 string def - - video.modes.list xmenu.video .xm_current get get - dup .vm_mode get 0 ge { - dup .vm_height get exch .vm_width get - ",%04d%04d.spl" splash_file sprintf - } { pop } ifelse + config.spl { + xmenu.video { + /splash_file 32 string def + + video.modes.list xmenu.video .xm_current get get + dup .vm_mode get 0 ge { + dup .vm_height get exch .vm_width get + ",%04d%04d.spl" splash_file sprintf + } { pop } ifelse - % check whether splash file exists - splash_file 1 add filesize .undef eq { - splash_file 0 0 put % empty string + % check whether splash file exists + splash_file 1 add filesize .undef eq { + splash_file 0 0 put % empty string + } if } if } if @@ -1590,6 +1600,12 @@ /gfxconfig.layout [ "penguin" gfxconfig.layout { } forall ] gfxconfig.layout free def } if +% for compatibility: prepend live section to layout section list if 'livecd' is set +/config.livecd "livecd" false gfxconfig.set.bool +config.livecd { + /gfxconfig.layout [ "live" gfxconfig.layout { } forall ] gfxconfig.layout free def +} if + % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Then, read the other config variables (might depend on video mode). @@ -1599,8 +1615,10 @@ /config.beep "beep" false gfxconfig.set.bool /config.volume "volume" 70 gfxconfig.set.int /config.talk "talk" false gfxconfig.set.bool -/config.livecd "livecd" false gfxconfig.set.bool /config._2space "_2space" false gfxconfig.set.bool +/config.memcheck "memcheck" false gfxconfig.set.bool +/config.spl "spl" false gfxconfig.set.bool +/config.autodown "autodown" false gfxconfig.set.bool /transp "menu.transparency" 0x20 gfxconfig.set.int /config.screen.width /config.screen.height "screen.size" 800 600 gfxconfig.set.int2 @@ -1638,7 +1656,6 @@ /panel.title.fg "panel.title.fg" white gfxconfig.set.int /panel.f-key.fg "panel.f-key.fg" black gfxconfig.set.int /keymap.submenu "keymap.submenu" false gfxconfig.set.bool -/keymap.mainmenu "keymap.mainmenu" false gfxconfig.set.bool /keymap.default "keymap" "" gfxconfig.set.str /install.default "install" "" gfxconfig.set.str @@ -1668,6 +1685,18 @@ /dud.url "dud.url" "" gfxconfig.set.str /dud.url.name "dud.url.name" "" gfxconfig.set.str +/config.key.F2 "key.F2" "" gfxconfig.set.str +/config.key.F3 "key.F3" "" gfxconfig.set.str +/config.key.F4 "key.F4" "" gfxconfig.set.str +/config.key.F5 "key.F5" "" gfxconfig.set.str +/config.key.F6 "key.F6" "" gfxconfig.set.str +/config.key.F7 "key.F7" "" gfxconfig.set.str +/config.key.F8 "key.F8" "" gfxconfig.set.str +/config.key.F9 "key.F9" "" gfxconfig.set.str +/config.key.F10 "key.F10" "" gfxconfig.set.str +/config.key.F11 "key.F11" "" gfxconfig.set.str +/config.key.F12 "key.F12" "" gfxconfig.set.str + /serial.line0 "serial.line0" [ ] gfxconfig.set.array_str /serial.line1 "serial.line1" [ ] gfxconfig.set.array_str /serial.line2 "serial.line2" [ ] gfxconfig.set.array_str diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_about.inc new/themes/openSUSE/src/dia_about.inc --- old/themes/openSUSE/src/dia_about.inc 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/openSUSE/src/dia_about.inc 2009-09-18 12:48:00.000000000 +0200 @@ -10,7 +10,9 @@ % ( ) => ( ) % /panel.about { - panel 0 panel.entry.help put + panel 0 + "help" panel.entry dup { [ keyF1 0 "F1" 5 -1 roll { } forall ] } if + put about.popup } def diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/gfxboot.cfg new/themes/openSUSE/src/gfxboot.cfg --- old/themes/openSUSE/src/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/themes/openSUSE/src/gfxboot.cfg 2009-09-18 14:19:38.000000000 +0200 @@ -0,0 +1,202 @@ +; Sections are read in the order given in base::layout, with section 'base' +; implicitly added at the end. If a config value is given more than once, +; the first entry wins. +; +; If a screen resolution can't be set, 640x480 is used as fallback (and +; section '640x480' added to the layout list). +; +; If the penguin screen is active, section 'penguin' is automatically added +; to the layout list. +; +; Setting livecd=1 implicitly adds section 'live' to the layout list. +; +; Color values: 24 bit RGB (e.g. 0xff0000 = red). +; + +[base] +; theme name +theme= +; other sections to read +layout=800x600 +; penguin theme likelihood (in percent, -1 = auto) +penguin=-1 +; activate speech output +talk=0 +; sound volume (0..100) +volume=70 +; menu background transparency (0..255) +menu.transparency=0x20 +; default font +font.normal=16x16.fnt +; main menu font +font.large=16x16.fnt +; background image +background=back.jpg +; max. visible main menu items +mainmenu.entries=8 +; minimal main menu selection bar width +mainmenu.bar.minwidth=300 +; main menu selection bar transparency (0..255) +mainmenu.bar.transparency=150 +; main menu colors +mainmenu.bar.color=0xffffff +mainmenu.normal.fg=0xffffff +mainmenu.selected.fg=0x000000 +; boot option colors +bootopt.label.fg=0xffffff +bootopt.text.fg=0xffffff +; progress bar color +progress.bar.color=0x295202 +; menu colors +menu.normal.bg=0xd8deed +menu.normal.fg=0x000000 +menu.selected.bg=0x6c6c6c +menu.selected.fg=0xffffff +; window colors +window.bg=0xd8deed +window.fg=0x000000 +window.title.bg=0x217b05 +window.title.fg=0xffffff +window.title.error.bg=0xc00000 +; help system colors +help.link.fg=0x0000a0 +help.link.selected.fg=0xffffff +help.link.selected.bg=0x0000a0 +help.highlight.fg=0x009000 +; panel colors +panel.fg=0xffffff +panel.title.fg=0xffffff +panel.f-key.fg=0xffe050 +; default keymap (e.g. de_DE, czech) +keymap= +; replace underscores ('_') with space in menu entries +_2space=1 + +[800x600] +; screen size +screen.size=800,600 +; upper left corner +mainmenu.pos=253,170 +; boot option input field position +bootopt.pos=263,480 + +[640x480] +; screen size +screen.size=640,480 +; upper left corner +mainmenu.pos=130,122 +; boot option input field position +bootopt.pos=263,380 + +[penguin] +; upper left corner +mainmenu.pos=220,163 +; main menu selection bar transparency (0..255) +mainmenu.bar.transparency=120 +; boot option input field position +bootopt.pos=263,490 +; background image +background=pback.jpg + +[install] +; show welcome animation +welcome=1 +; beep when menu is ready +beep=1 +; main menu item shown only if iso is tagged for media check +mediacheck=mediachk +; main menu items where user can't add boot options +nobootoptions=harddisk,memtest +; main menu items that are not passed an 'install' parameter +noinstallopt=harddisk,firmware,memtest +; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) +install= +; default repo location +install.http.server= +install.http.path= +install.nfs.server= +install.nfs.path= +install.ftp.server= +install.ftp.path= +install.ftp.user= +install.ftp.password= +install.smb.server= +install.smb.share= +install.smb.path= +install.smb.domain= +install.smb.user= +install.smb.password= +install.hd.device= +install.hd.path= +; default driver update (one of: yes, no, file, url; default: no) +dud= +; if 'dud=file': file name on DVD +dud.file= +; if 'dud=url': URL +dud.url= +; if 'dud=url': menu item name (default = 'URL') +dud.url.name= +; serial line setup (up to four lines) +; format: port,baud,dev +; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) +; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) +; - dev: linux device name (e.g. ttyS0) +; - all lines are set up with 8 bits, no parity, 1 stop bit +; - if the bootloader also has a serial line setup, the port is +; automatically used +serial.line0=0,0,ttyS0 +serial.line1=1,0,ttyS1 +serial.line2= +serial.line3= +; show keymap menu as submenu in lang dialog +keymap.submenu=1 +; check min memory size +memcheck=0 +; apppend *.spl to initrd +spl=1 +; move down one menu entry the first time an F-key is used +autodown=1 +; F-key assignments +; value can be one of: lang, video, install, kernelopts, dud, bits, keymap, +; profile, restore +; note1: 'bits' is only shown on x86_64, 'profile' only when a file 'profile' +; exists, 'restore' only when there is a boot entry 'restore' +; note2: F1 is always help, F9 enables speech output, F10 exits gfxboot +key.F2=lang +key.F3=video +key.F4=install +key.F5=kernelopts +key.F6=dud +key.F7=bits + +[boot] +; show welcome animation +welcome=0 +; beep when menu is ready +beep=0 +; show keymap menu as submenu in lang dialog +keymap.submenu=0 +; system restore menu entry +restore.title= +; F-key assignments, see install section for doc +key.F2=lang +key.F3=profile +key.F4=keymap +key.F11=restore + +[live] +; set livecd flag +livecd=1 +; move down one menu entry the first time an F-key is used +autodown=0 +; F-key assignments, see install section for doc +key.F2=lang +key.F3=video +key.F4= +key.F5= +key.F6= +key.F7= +key.F8= +key.F11= +key.F12= + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/panel.inc new/themes/openSUSE/src/panel.inc --- old/themes/openSUSE/src/panel.inc 2009-07-02 15:47:40.000000000 +0200 +++ new/themes/openSUSE/src/panel.inc 2009-09-18 14:18:14.000000000 +0200 @@ -25,79 +25,30 @@ /panel.back 0 panel.y moveto panel.size savescreen def - /panel.entry.help [ keyF1 0 "F1" /panel.help /panel.help.width /panel.help.update .undef ] def - /panel.entry.about [ keyF1 0 "F1" /panel.about /panel.about.width /panel.about.update .undef ] def + /config.key.F1 about.msg { "about" } { "help" } ifelse def % define panel layout - /panel.full [ + /panel [ % [ key x label show_func width_func update_func init_func ] - about.msg { - panel.entry.about - } { - panel.entry.help - } ifelse - - syslinux { - - config.livecd { - - [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] - [ keyF3 0 "F3" /panel.video /panel.video.width /panel.video.update /video.init ] - - } { - - [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] - [ keyF3 0 "F3" /panel.video /panel.video.width /panel.video.update /video.init ] - [ keyF4 0 "F4" /panel.install /panel.install.width /panel.install.update /install.init ] - [ keyF5 0 "F5" /panel.kernelopts /panel.kernelopts.width /panel.kernelopts.update /kernelopts.init ] - [ keyF6 0 "F6" /panel.dud /panel.dud.width /panel.dud.update /dud.init ] - - 32+64bit_source { - 64bit { - 32bit_boot_dir .undef ne - 64bit_boot_dir .undef ne - 32bit_boot_dir 64bit_boot_dir ne - and and { - [ keyF7 0 "F7" /panel.bits /panel.bits.width /panel.bits.update /bits.init ] - } if - } if - } if - - keymap.mainmenu { - [ keyF8 0 "F8" /panel.keymap /panel.keymap.width /panel.keymap.update /keymap.init ] - } if - - } ifelse - - xmenu.bits .undef eq { bits.init } if - - } { - - [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] - "profiles" findfile dup { - /profile.data exch def - [ keyF3 0 "F3" /panel.profile /panel.profile.width /panel.profile.update /profile.init ] - } { pop } ifelse - - keymap.mainmenu { - [ keyF4 0 "F4" /panel.keymap /panel.keymap.width /panel.keymap.update /keymap.init ] - } if - - % no F11 entry unless 'restore' entry exists - config.restore.id .undef ne { - [ keyF11 0 "F11" /panel.restore /panel.restore.width /panel.restore.update .undef ] - } if - - } ifelse + config.key.F1 panel.entry dup { [ keyF1 0 "F1" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F2 panel.entry dup { [ keyF2 0 "F2" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F3 panel.entry dup { [ keyF3 0 "F3" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F4 panel.entry dup { [ keyF4 0 "F4" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F5 panel.entry dup { [ keyF5 0 "F5" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F6 panel.entry dup { [ keyF6 0 "F6" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F7 panel.entry dup { [ keyF7 0 "F7" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F8 panel.entry dup { [ keyF8 0 "F8" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F11 panel.entry dup { [ keyF11 0 "F11" 5 -1 roll { } forall ] } { pop } ifelse + config.key.F12 panel.entry dup { [ keyF12 0 "F12" 5 -1 roll { } forall ] } { pop } ifelse ] def - % initialize all - panel.full { 6 get dup .undef ne { exec } { pop } ifelse } forall + xmenu.bits .undef eq { bits.init } if - /panel panel.full def + % initialize all + panel { 6 get dup .undef ne { exec } { pop } ifelse } forall panel.show } def @@ -178,13 +129,10 @@ % /panel.extra { % move down one menu entry; but only once - % see keyDown in main::main.input + % see keyDown in menu::main.input % only for install CDs - syslinux not { return } if - - % not for live cd - config.livecd { return } if + config.autodown not { return } if % not for F1 dup keyF1 eq { return } if @@ -204,3 +152,60 @@ } def +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Get panel entry definition. +% +% ( label -- array ) +% +/panel.entry { + % [ show_func width_func update_func init_func ] + + dup "help" eq { pop [ /panel.help /panel.help.width /panel.help.update .undef ] return } if + dup "about" eq { pop [ /panel.about /panel.about.width /panel.about.update .undef ] return } if + + dup "lang" eq { pop [ /panel.lang /panel.lang.width /panel.lang.update /lang.init ] return } if + dup "video" eq { pop [ /panel.video /panel.video.width /panel.video.update /video.init ] return } if + dup "install" eq { pop [ /panel.install /panel.install.width /panel.install.update /install.init ] return } if + dup "kernelopts" eq { pop [ /panel.kernelopts /panel.kernelopts.width /panel.kernelopts.update /kernelopts.init ] return } if + dup "dud" eq { pop [ /panel.dud /panel.dud.width /panel.dud.update /dud.init ] return } if + dup "keymap" eq { pop [ /panel.keymap /panel.keymap.width /panel.keymap.update /keymap.init ] return } if + + dup "bits" eq { pop + .undef + 32+64bit_source { + 64bit { + 32bit_boot_dir .undef ne + 64bit_boot_dir .undef ne + 32bit_boot_dir 64bit_boot_dir ne + and and { + pop [ /panel.bits /panel.bits.width /panel.bits.update /bits.init ] + } if + } if + } if + + return + } if + + dup "profile" eq { pop + .undef + "profiles" findfile dup { + /profile.data exch def + pop [ /panel.profile /panel.profile.width /panel.profile.update /profile.init ] + } { pop } ifelse + + return + } if + + dup "restore" eq { pop + .undef + config.restore.id .undef ne { + pop [ /panel.restore /panel.restore.width /panel.restore.update .undef ] + } if + + return + } if + + pop .undef +} def + + ++++++ upstream.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/upstream/data-boot/gfxboot.cfg new/themes/upstream/data-boot/gfxboot.cfg --- old/themes/upstream/data-boot/gfxboot.cfg 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/upstream/data-boot/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=upstream -; other sections to read -layout=800x600,boot -; penguin theme likelihood (in percent, -1 = auto) -penguin=0 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=70 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x4f9805 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=0 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/upstream/data-install/gfxboot.cfg new/themes/upstream/data-install/gfxboot.cfg --- old/themes/upstream/data-install/gfxboot.cfg 2009-07-02 15:47:30.000000000 +0200 +++ new/themes/upstream/data-install/gfxboot.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,163 +0,0 @@ -; Sections are read in the order given in base::layout, with section 'base' -; implicitly added at the end. If a config value is given more than once, -; the first entry wins. -; -; If a screen resolution can't be set, 640x480 is used as fallback (and -; section '640x480' added to the layout list). -; -; If the penguin screen is active, section 'penguin' is automatically added -; to the layout list. -; -; Color values: 24 bit RGB (e.g. 0xff0000 = red). -; - -[base] -; theme name -theme=upstream -; other sections to read -layout=800x600,install -; penguin theme likelihood (in percent, -1 = auto) -penguin=0 -; activate speech output -talk=0 -; sound volume (0..100) -volume=70 -; menu background transparency (0..255) -menu.transparency=0x20 -; default font -font.normal=16x16.fnt -; main menu font -font.large=16x16.fnt -; background image -background=back.jpg -; max. visible main menu items -mainmenu.entries=8 -; minimal main menu selection bar width -mainmenu.bar.minwidth=300 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=70 -; main menu colors -mainmenu.bar.color=0xffffff -mainmenu.normal.fg=0xffffff -mainmenu.selected.fg=0x000000 -; boot option colors -bootopt.label.fg=0xffffff -bootopt.text.fg=0xffffff -; progress bar color -progress.bar.color=0x295202 -; menu colors -menu.normal.bg=0xd8deed -menu.normal.fg=0x000000 -menu.selected.bg=0x6c6c6c -menu.selected.fg=0xffffff -; window colors -window.bg=0xd8deed -window.fg=0x000000 -window.title.bg=0x4f9805 -window.title.fg=0xffffff -window.title.error.bg=0xc00000 -; help system colors -help.link.fg=0x0000a0 -help.link.selected.fg=0xffffff -help.link.selected.bg=0x0000a0 -help.highlight.fg=0x009000 -; panel colors -panel.fg=0xffffff -panel.title.fg=0xffffff -panel.f-key.fg=0xffe050 -; default keymap (e.g. de_DE, czech) -keymap= -; replace underscores ('_') with space in menu entries -_2space=1 - -[800x600] -; screen size -screen.size=800,600 -; upper left corner -mainmenu.pos=253,170 -; boot option input field position -bootopt.pos=263,480 - -[640x480] -; screen size -screen.size=640,480 -; upper left corner -mainmenu.pos=130,122 -; boot option input field position -bootopt.pos=263,380 - -[penguin] -; upper left corner -mainmenu.pos=220,163 -; main menu selection bar transparency (0..255) -mainmenu.bar.transparency=120 -; boot option input field position -bootopt.pos=263,490 -; background image -background=pback.jpg - -[install] -; show welcome animation -welcome=1 -; beep when menu is ready -beep=1 -; main menu item shown only if iso is tagged for media check -mediacheck=mediachk -; main menu items where user can't add boot options -nobootoptions=harddisk,memtest -; main menu items that are not passed an 'install' parameter -noinstallopt=harddisk,firmware,memtest -; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom) -install= -; default repo location -install.http.server= -install.http.path= -install.nfs.server= -install.nfs.path= -install.ftp.server= -install.ftp.path= -install.ftp.user= -install.ftp.password= -install.smb.server= -install.smb.share= -install.smb.path= -install.smb.domain= -install.smb.user= -install.smb.password= -install.hd.device= -install.hd.path= -; default driver update (one of: yes, no, file, url; default: no) -dud= -; if 'dud=file': file name on DVD -dud.file= -; if 'dud=url': URL -dud.url= -; if 'dud=url': menu item name (default = 'URL') -dud.url.name= -; serial line setup (up to four lines) -; format: port,baud,dev -; - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8) -; - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600) -; - dev: linux device name (e.g. ttyS0) -; - all lines are set up with 8 bits, no parity, 1 stop bit -; - if the bootloader also has a serial line setup, the port is -; automatically used -serial.line0=0,0,ttyS0 -serial.line1=1,0,ttyS1 -serial.line2= -serial.line3= -; show keymap menu as submenu in lang dialog -keymap.submenu=1 -; show keymap in main menu -keymap.mainmenu=0 - -[boot] -; show welcome animation -welcome=0 -; beep when menu is ready -beep=1 -; show keymap menu as submenu in lang dialog -keymap.submenu=0 -; show keymap in main menu -keymap.mainmenu=1 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org