webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

SVN ist durcheinandergekommen bei Pfad-Anpassung Part 2 (Ende)

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@289 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
casemaster
2006-09-19 20:06:50 +00:00
parent 1333ff81a2
commit c98e55d8f8
12 changed files with 1663 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/patches/grub-0.97/bad-assert-sideeffect Normal file
View File

@@ -0,0 +1,15 @@
--- grub-0.95/lib/device.c.orig 2004-05-23 18:34:29.000000000 +0200
+++ grub-0.95/lib/device.c 2004-09-21 18:15:23.785137837 +0200
@@ -828,9 +828,11 @@ int
is_disk_device (char **map, int drive)
{
struct stat st;
+ int retval;
assert (map[drive] != 0);
- assert (stat (map[drive], &st) == 0);
+ retval = stat (map[drive], &st);
+ assert (retval == 0);
/* For now, disk devices under Linux are all block devices. */
return S_ISBLK (st.st_mode);
}

11
src/patches/grub-0.97/fix-uninitialized Normal file
View File

@@ -0,0 +1,11 @@
--- grub-0.97/netboot/i82586.c.orig 2003-07-09 13:45:37.000000000 +0200
+++ grub-0.97/netboot/i82586.c 2006-04-20 18:50:20.000000000 +0200
@@ -735,7 +735,7 @@ static unsigned char exos_i186_init[] =
static int exos205_probe2(void)
{
unsigned short i;
- unsigned short shmem[10];
+ unsigned short shmem[10] = { 0,0,0,0,0,0,0,0,0,0 };
/* Fix the ISCP address and base. */
init_words[3] = scb_base;

143
src/patches/grub-0.97/force-LBA-off.diff Normal file
View File

@@ -0,0 +1,143 @@
diff -ur grub-0.93~/docs/grub.texi grub-0.93/docs/grub.texi
--- grub-0.93~/docs/grub.texi 2003-02-06 12:30:12.000000000 +0100
+++ grub-0.93/docs/grub.texi 2003-02-06 14:15:30.000000000 +0100
@@ -2632,7 +2632,7 @@
@node install
@subsection install
-@deffn Command install [@option{--force-lba}] [@option{--stage2=os_stage2_file}] stage1_file [@option{d}] dest_dev stage2_file [addr] [@option{p}] [config_file] [real_config_file]
+@deffn Command install [@option{--force-lba[=off]}] [@option{--stage2=os_stage2_file}] stage1_file [@option{d}] dest_dev stage2_file [addr] [@option{p}] [config_file] [real_config_file]
This command is fairly complex, and you should not use this command
unless you are familiar with GRUB. Use @command{setup} (@pxref{setup})
instead.
@@ -2679,6 +2679,13 @@
bitmap even if they do have the support. So GRUB provides a solution to
ignore the wrong bitmap, that is, the option @option{--force-lba}. Don't
use this option if you know that your BIOS doesn't have LBA support.
+On the other hand there is at least one known BIOS that does the opposite,
+it claims to support LBA and then fails to provide it. Iff you have an
+Adaptec 2940 with BIOS revision 1.21 ( newer ones just work and older ones
+don't make the false claim ), or otherwise experience grub hanging
+after stage1, you can try to use the option @option{--force-lba=off},
+as long as all disk blocks involved in booting reside
+within the first 1024 cylinders.
@strong{Caution3:} You must specify the option @option{--stage2} in the
grub shell, if you cannot unmount the filesystem where your stage2 file
diff -ur grub-0.93~/stage1/stage1.S grub-0.93/stage1/stage1.S
--- grub-0.93~/stage1/stage1.S 2002-09-08 03:58:08.000000000 +0200
+++ grub-0.93/stage1/stage1.S 2003-02-06 13:19:50.000000000 +0100
@@ -163,7 +163,11 @@
/* check if AH=0x42 is supported if FORCE_LBA is zero */
MOV_MEM_TO_AL(ABS(force_lba)) /* movb ABS(force_lba), %al */
testb %al, %al
+ /* check if LBA is forced OFF 0x80 <= %al <= 0xff */
+ js chs_mode
+ /* or forced ON 0x01 <= %al <= 0x7f */
jnz lba_mode
+ /* otherwise trust BIOS int's result */
andw $1, %cx
jz chs_mode
diff -ur grub-0.93~/stage2/asm.S grub-0.93/stage2/asm.S
--- grub-0.93~/stage2/asm.S 2003-02-06 12:30:12.000000000 +0100
+++ grub-0.93/stage2/asm.S 2003-02-06 13:35:32.000000000 +0100
@@ -1083,7 +1083,11 @@
/* check if AH=0x42 is supported if FORCE_LBA is zero */
movb EXT_C(force_lba), %al
testb %al, %al
+ /* check if LBA is forced OFF 0x80 <= %al <= 0xff */
+ js 1f
+ /* or forced ON 0x01 <= %al <= 0x7f */
jnz 2f
+ /* otherwise trust BIOS int's result */
andw $1, %cx
jnz 2f
diff -ur grub-0.93~/stage2/builtins.c grub-0.93/stage2/builtins.c
--- grub-0.93~/stage2/builtins.c 2003-02-06 12:30:12.000000000 +0100
+++ grub-0.93/stage2/builtins.c 2003-02-06 13:56:01.000000000 +0100
@@ -1832,7 +1832,12 @@
/* First, check the GNU-style long option. */
while (1)
{
- if (grub_memcmp ("--force-lba", arg, sizeof ("--force-lba") - 1) == 0)
+ if (grub_memcmp ("--force-lba=off", arg, sizeof ("--force-lba=off") - 1) == 0)
+ {
+ is_force_lba = 0xff;
+ arg = skip_to (0, arg);
+ }
+ else if (grub_memcmp ("--force-lba", arg, sizeof ("--force-lba") - 1) == 0)
{
is_force_lba = 1;
arg = skip_to (0, arg);
@@ -2253,7 +2258,7 @@
"install",
install_func,
BUILTIN_CMDLINE,
- "install [--stage2=STAGE2_FILE] [--force-lba] STAGE1 [d] DEVICE STAGE2 [ADDR] [p] [CONFIG_FILE] [REAL_CONFIG_FILE]",
+ "install [--stage2=STAGE2_FILE] [--force-lba[=off]] STAGE1 [d] DEVICE STAGE2 [ADDR] [p] [CONFIG_FILE] [REAL_CONFIG_FILE]",
"Install STAGE1 on DEVICE, and install a blocklist for loading STAGE2"
" as a Stage 2. If the option `d' is present, the Stage 1 will always"
" look for the disk where STAGE2 was installed, rather than using"
@@ -2266,8 +2271,9 @@
" 1.5 and REAL_CONFIG_FILE is present, then the Stage 2 CONFIG_FILE is"
" patched with the configuration filename REAL_CONFIG_FILE."
" If the option `--force-lba' is specified, disable some sanity checks"
- " for LBA mode. If the option `--stage2' is specified, rewrite the Stage"
- " 2 via your OS's filesystem instead of the raw device."
+ " for LBA mode, `--force-lba=off' will disable it completely. If the"
+ " option `--stage2' is specified, rewrite the Stage 2 via your OS's"
+ " filesystem instead of the raw device."
};
@@ -3898,7 +3904,12 @@
/* Check if the user specifies --force-lba. */
while (1)
{
- if (grub_memcmp ("--force-lba", arg, sizeof ("--force-lba") - 1) == 0)
+ if (grub_memcmp ("--force-lba=off", arg, sizeof ("--force-lba=off") - 1) == 0)
+ {
+ is_force_lba = 0xff;
+ arg = skip_to (0, arg);
+ }
+ else if (grub_memcmp ("--force-lba", arg, sizeof ("--force-lba") - 1) == 0)
{
is_force_lba = 1;
arg = skip_to (0, arg);
@@ -4026,7 +4037,9 @@
#if 1
/* Don't embed a drive number unnecessarily. */
grub_sprintf (cmd_arg, "%s%s%s%s %s%s %s p %s %s",
- is_force_lba? "--force-lba " : "",
+ is_force_lba ?
+ (is_force_lba == 0xff ? "--force-lba=off " : "--force-lba ")
+ : "",
stage2_arg? stage2_arg : "",
stage2_arg? " " : "",
stage1,
@@ -4079,17 +4092,18 @@
"setup",
setup_func,
BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
- "setup [--prefix=DIR] [--stage2=STAGE2_FILE] [--force-lba] INSTALL_DEVICE [IMAGE_DEVICE]",
+ "setup [--prefix=DIR] [--stage2=STAGE2_FILE] [--force-lba[=off]] INSTALL_DEVICE [IMAGE_DEVICE]",
"Set up the installation of GRUB automatically. This command uses"
" the more flexible command \"install\" in the backend and installs"
" GRUB into the device INSTALL_DEVICE. If IMAGE_DEVICE is specified,"
" then find the GRUB images in the device IMAGE_DEVICE, otherwise"
" use the current \"root device\", which can be set by the command"
" \"root\". If you know that your BIOS should support LBA but GRUB"
- " doesn't work in LBA mode, specify the option `--force-lba'."
- " If you install GRUB under the grub shell and you cannot unmount the"
- " partition where GRUB images reside, specify the option `--stage2'"
- " to tell GRUB the file name under your OS."
+ " doesn't work in LBA mode, specify the option `--force-lba'. If the"
+ " BIOS claims to support LBA mode but really doesn't, use"
+ " `--force-lba=off'. If you install GRUB under the grub shell and"
+ " you cannot unmount the partition where GRUB images reside, specify"
+ " the option `--stage2' to tell GRUB the file name under your OS."
};

118
src/patches/grub-0.97/grub-0.97-devicemap.diff Normal file
View File

@@ -0,0 +1,118 @@
diff -Burbp grub-0.93.orig/grub/main.c grub-0.93/grub/main.c
--- grub-0.93.orig/grub/main.c 2003-06-10 18:29:37.000000000 +0200
+++ grub-0.93/grub/main.c 2003-06-10 18:30:36.000000000 +0200
@@ -44,7 +44,7 @@ int use_curses = 0;
int verbose = 0;
int read_only = 0;
int floppy_disks = 1;
-char *device_map_file = 0;
+char *device_map_file = "/boot/grub/device.map";
static int default_boot_drive;
static int default_install_partition;
static char *default_config_file;
diff -Burbp grub-0.93.orig/lib/device.c grub-0.93/lib/device.c
--- grub-0.93.orig/lib/device.c 2003-06-10 18:29:37.000000000 +0200
+++ grub-0.93/lib/device.c 2003-06-10 18:30:36.000000000 +0200
@@ -382,6 +382,7 @@ read_device_map (FILE *fp, char **map, c
probing devices. */
char buf[1024]; /* XXX */
int line_number = 0;
+ int retval = 0; /* default to failure */
while (fgets (buf, sizeof (buf), fp))
{
@@ -408,14 +409,14 @@ read_device_map (FILE *fp, char **map, c
if (*ptr != '(')
{
show_error (line_number, "No open parenthesis found");
- return 0;
+ continue;
}
ptr++;
if ((*ptr != 'f' && *ptr != 'h') || *(ptr + 1) != 'd')
{
show_error (line_number, "Bad drive name");
- return 0;
+ continue;
}
if (*ptr == 'f')
@@ -426,7 +427,7 @@ read_device_map (FILE *fp, char **map, c
if (drive < 0 || drive > 8)
{
show_error (line_number, "Bad device number");
- return 0;
+ continue;
}
if (! is_floppy)
@@ -435,7 +436,7 @@ read_device_map (FILE *fp, char **map, c
if (*ptr != ')')
{
show_error (line_number, "No close parenthesis found");
- return 0;
+ continue;
}
ptr++;
@@ -446,7 +447,7 @@ read_device_map (FILE *fp, char **map, c
if (! *ptr)
{
show_error (line_number, "No filename found");
- return 0;
+ continue;
}
/* Terminate the filename. */
@@ -464,9 +465,11 @@ read_device_map (FILE *fp, char **map, c
map[drive] = strdup (ptr);
assert (map[drive]);
+
+ retval = 1; /* at least 1 drive configured successfully */
}
- return 1;
+ return retval;
}
/* Initialize the device map MAP. *MAP will be allocated from the heap
@@ -671,7 +674,7 @@ write_to_partition (char **map, int driv
int sector, int size, const char *buf)
{
char dev[PATH_MAX]; /* XXX */
- int fd;
+ int fd, len, pnum;
if ((partition & 0x00FF00) != 0x00FF00)
{
@@ -689,7 +692,16 @@ write_to_partition (char **map, int driv
if (strcmp (dev + strlen(dev) - 5, "/disc") == 0)
strcpy (dev + strlen(dev) - 5, "/part");
}
- sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1);
+
+ len = strlen(dev);
+ pnum = ((partition >> 16) & 0xFF);
+ if (isdigit(dev[len-1]))
+ {
+ /* It is obviously some RAID disk: "/dev/<dsk>/c0d0" . "p1" */
+ sprintf (dev + len, "p%d", pnum + 1);
+ }
+ else
+ sprintf (dev + len, "%d", pnum + 1);
/* Open the partition. */
fd = open (dev, O_RDWR);
--- grub-0.94/util/grub-md5-crypt.in.orig 2003-07-09 04:45:51.000000000 -0700
+++ grub-0.94/util/grub-md5-crypt.in 2004-05-11 09:26:31.943224317 -0700
@@ -88,7 +88,7 @@
fi
# Run the grub shell.
-$grub_shell --batch --device-map=/dev/null <<EOF \
+$grub_shell --batch <<EOF \
| grep "^Encrypted: " | sed 's/^Encrypted: //'
md5crypt
$password

16
src/patches/grub-0.97/grub-0.97-initrdaddr.diff Normal file
View File

@@ -0,0 +1,16 @@
--- grub-0.96/stage2/boot.c
+++ grub-0.96/stage2/boot.c
@@ -824,8 +824,11 @@
moveto = (mbi.mem_upper + 0x400) << 10;
moveto = (moveto - len) & 0xfffff000;
- max_addr = (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0203
- ? lh->initrd_addr_max : LINUX_INITRD_MAX_ADDRESS);
+ max_addr = LINUX_INITRD_MAX_ADDRESS;
+ if (lh->header == LINUX_MAGIC_SIGNATURE &&
+ lh->version >= 0x0203 &&
+ lh->initrd_addr_max < max_addr)
+ max_addr = lh->initrd_addr_max;
if (moveto + len >= max_addr)
moveto = (max_addr - len) & 0xfffff000;

70
src/patches/grub-0.97/grub-0.97-path-patch Normal file
View File

@@ -0,0 +1,70 @@
diff -ur grub-0.93/Makefile.am grub-0.93.new/Makefile.am
--- grub-0.93/Makefile.am 2002-07-01 16:15:36.000000000 +0200
+++ grub-0.93.new/Makefile.am 2003-02-04 13:03:36.000000000 +0100
@@ -2,3 +2,4 @@
AUTOMAKE_OPTIONS = 1.5
SUBDIRS = netboot stage2 stage1 lib grub util docs
EXTRA_DIST = BUGS MAINTENANCE
+pkgdatadir=$(datadir)
diff -ur grub-0.93/stage1/Makefile.am grub-0.93.new/stage1/Makefile.am
--- grub-0.93/stage1/Makefile.am 2002-09-08 03:58:08.000000000 +0200
+++ grub-0.93.new/stage1/Makefile.am 2003-02-04 13:03:36.000000000 +0100
@@ -1,4 +1,4 @@
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = /usr/lib/grub
nodist_pkglib_DATA = stage1
CLEANFILES = $(nodist_pkglib_DATA)
diff -ur grub-0.93/stage2/Makefile.am grub-0.93.new/stage2/Makefile.am
--- grub-0.93/stage2/Makefile.am 2002-11-29 19:00:53.000000000 +0100
+++ grub-0.93.new/stage2/Makefile.am 2003-02-04 13:03:36.000000000 +0100
@@ -26,7 +26,7 @@
-DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings
# Stage 2 and Stage 1.5's.
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = /usr/lib/grub
EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
diff -ur grub-0.93/util/grub-install.in grub-0.93.new/util/grub-install.in
--- grub-0.93/util/grub-install.in 2002-05-20 13:21:50.000000000 +0200
+++ grub-0.93.new/util/grub-install.in 2003-02-04 13:03:36.000000000 +0100
@@ -27,7 +27,7 @@
host_cpu=@host_cpu@
host_os=@host_os@
host_vendor=@host_vendor@
-pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
+pkglibdir=${libdir}/${PACKAGE}/
grub_shell=${sbindir}/grub
grub_set_default=${sbindir}/grub-set-default
@@ -378,14 +378,19 @@
exit 1
fi
-# Copy the GRUB images to the GRUB directory.
-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
- rm -f $file || exit 1
-done
-for file in \
- ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
- cp -f $file ${grubdir} || exit 1
-done
+# FHS says that /usr/share is used for architecture independent data,
+# so all stage-files are directly installed to /usr/lib/grub.
+# Therefor this part is no longer needed.
+# <--cut_here-->
+## Copy the GRUB images to the GRUB directory.
+#for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+# rm -f $file || exit 1
+#done
+#for file in \
+# ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
+# cp -f $file ${grubdir} || exit 1
+#done
+# <--uncut-->
# Make sure that GRUB reads the same images as the host OS.
test -n "$mkimg" && img_file=`$mkimg`
Only in grub-0.93.new/util: grub-install.in.orig

56
src/patches/grub-0.97/grub-0.97-protexec.patch Normal file
View File

@@ -0,0 +1,56 @@
--- grub-0.96/grub/asmstub.c
+++ grub-0.96/grub/asmstub.c
@@ -43,6 +43,8 @@
#include <termios.h>
#include <signal.h>
+#include <sys/mman.h>
+
#ifdef __linux__
# include <sys/ioctl.h> /* ioctl */
# if !defined(__GLIBC__) || \
@@ -140,14 +142,30 @@
}
assert (grub_scratch_mem == 0);
- scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
+#ifdef MAP_32BIT
+#define MY_MAP_SET MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | MAP_32BIT
+#else
+#define MY_MAP_SET MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS
+#endif
+ scratch = mmap(NULL,
+ 0x100000 + EXTENDED_MEMSIZE + 15,
+ PROT_EXEC | PROT_READ | PROT_WRITE,
+ MY_MAP_SET,
+ -1,
+ 0);
+
assert (scratch);
grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
/* FIXME: simulate the memory holes using mprot, if available. */
assert (disks == 0);
- disks = malloc (NUM_DISKS * sizeof (*disks));
+ disks = mmap(NULL,
+ NUM_DISKS * sizeof (*disks),
+ PROT_EXEC | PROT_READ | PROT_WRITE,
+ MY_MAP_SET,
+ -1,
+ 0);
assert (disks);
/* Initialize DISKS. */
for (i = 0; i < NUM_DISKS; i++)
@@ -213,9 +231,9 @@
/* Release memory. */
restore_device_map (device_map);
device_map = 0;
- free (disks);
+ munmap(disks, NUM_DISKS * sizeof (*disks));
disks = 0;
- free (scratch);
+ munmap(scratch, 0x100000 + EXTENDED_MEMSIZE + 15);
grub_scratch_mem = 0;
if (serial_device)

61
src/patches/grub-0.97/grub-R Normal file
View File

@@ -0,0 +1,61 @@
--- grub-0.96/stage2/builtins.c.orig 2004-06-20 15:33:04.000000000 +0200
+++ grub-0.96/stage2/builtins.c 2005-09-02 14:38:53.000000000 +0200
@@ -762,11 +762,11 @@
default_func (char *arg, int flags)
{
#ifndef SUPPORT_DISKLESS
- if (grub_strcmp (arg, "saved") == 0)
+ if (grub_strcmp (arg, "saved") == 0 || (saved_entryno & 0x4000))
{
- default_entry = saved_entryno;
- return 0;
+ default_entry = saved_entryno & 0x3fff;
}
+ else
#endif /* SUPPORT_DISKLESS */
if (! safe_parse_maxint (&arg, &default_entry))
@@ -787,6 +787,22 @@
#endif
};
+#ifndef SUPPORT_DISKLESS
+static int savedefault_func (char *arg, int flags);
+void __savedefault_once_reset()
+{
+ if (saved_entryno & 0x4000)
+ {
+ int saved_current_entryno = current_entryno;
+ grub_timeout = 0;
+ current_entryno = default_entry;
+ savedefault_func("\0", BUILTIN_SCRIPT);
+ current_entryno = saved_current_entryno;
+ saved_entryno &= 0x3fff;
+ }
+}
+#endif /* SUPPORT_DISKLESS */
+
#ifdef GRUB_UTIL
/* device */
--- grub-0.96/stage2/stage2.c~ 2004-07-24 20:53:47.000000000 +0200
+++ grub-0.96/stage2/stage2.c 2005-09-02 14:45:04.000000000 +0200
@@ -827,6 +827,7 @@
return pos;
}
+extern void __savedefault_once_reset();
/* This is the starting function in C. */
void
@@ -1048,7 +1049,9 @@
}
while (is_preset);
}
-
+#ifndef SUPPORT_DISKLESS
+ __savedefault_once_reset();
+#endif
if (! num_entries)
{
/* If no acceptable config file, goto command-line, starting

994
src/patches/grub-0.97/grub-gfxmenu-v8.diff Normal file
View File

@@ -0,0 +1,994 @@
--- docs/grub.texi
+++ docs/grub.texi
@@ -2118,6 +2118,7 @@
* default:: Set the default entry
* fallback:: Set the fallback entry
* hiddenmenu:: Hide the menu interface
+* gfxmenu:: Use graphical menu interface
* timeout:: Set the timeout
* title:: Start a menu entry
@end menu
@@ -2150,6 +2151,15 @@
@end deffn
+@node gfxmenu
+@subsection gfxmenu
+
+@deffn Command gfxmenu file
+Use the graphical menu interface. The graphics data are taken from
+@var{file} and must be created using 'mkbootmsg' from the gfxboot package.
+@end deffn
+
+
@node hiddenmenu
@subsection hiddenmenu
--- grub/asmstub.c
+++ grub/asmstub.c
@@ -498,6 +498,32 @@
return 0;
}
+/* graphical menu functions . */
+int
+gfx_init (gfx_data_t *gfx_data)
+{
+ return 0;
+}
+
+int
+gfx_done (gfx_data_t *gfx_data)
+{
+ return 0;
+}
+
+int
+gfx_input (gfx_data_t *gfx_data, int *menu_entry)
+{
+ return 0;
+}
+
+int
+gfx_setup_menu (gfx_data_t *gfx_data)
+{
+ return 0;
+}
+
+
/* low-level timing info */
int
getrtsecs (void)
--- stage2/asm.S
+++ stage2/asm.S
@@ -1614,6 +1614,286 @@
popl %ebp
ret
+
+/*
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ *
+ * graphical menu functions
+ *
+ */
+
+/*
+ * int gfx_init (gfx_data_t *gfx_data)
+ *
+ * init gfx things
+ *
+ * return vales:
+ * 0: ok
+ * 1: failed
+ * sets gfx_data->ok
+ */
+
+ENTRY(gfx_init)
+ pushl %ebp
+ movl %esp, %ebp
+
+ pushl %edi
+ pushl %esi
+ pushl %ebx
+
+ movl 8(%ebp),%edx
+ movl %edx,%edi
+ leal gfx_ofs_sys_cfg(%edx),%esi
+ andl $0xf,%edi
+ shrl $4,%edx
+
+ pushl %ebp
+
+ call EXT_C(prot_to_real)
+ .code16
+
+ pushw %ds
+ movw %dx,%ds
+
+ lcall *gfx_ofs_jmp_table + 4 * 0 (%di)
+
+ sbbl %ebx,%ebx
+ negl %ebx
+
+ popw %ds
+
+ DATA32 call EXT_C(real_to_prot)
+ .code32
+
+ popl %ebp
+
+ movl %ebx,%eax
+ xorl $1,%ebx
+ movl 8(%ebp),%edx
+ movl %ebx,gfx_ofs_ok(%edx)
+
+ popl %ebx
+ popl %esi
+ popl %edi
+
+ popl %ebp
+ ret
+
+
+/*
+ * int gfx_done (gfx_data_t *gfx_data)
+ *
+ * shut down gfx things
+ *
+ * return vales:
+ * always 0
+ * sets gfx_data->ok
+ */
+
+ENTRY(gfx_done)
+ pushl %ebp
+ movl %esp, %ebp
+
+ pushl %edi
+ pushl %esi
+ pushl %ebx
+
+ movl 8(%ebp),%edx
+ movl %edx,%ebx
+ andl $0xf,%ebx
+ shrl $4,%edx
+
+ pushl %ebp
+
+ call EXT_C(prot_to_real)
+ .code16
+
+ pushw %ds
+
+ movw %dx,%ds
+
+ lcall *gfx_ofs_jmp_table + 4 * 1 (%bx)
+
+ popw %ds
+
+ DATA32 call EXT_C(real_to_prot)
+ .code32
+
+ popl %ebp
+
+ xorl %eax,%eax
+ movl 8(%ebp),%edx
+ movl %eax,gfx_ofs_ok(%edx)
+
+ popl %ebx
+ popl %esi
+ popl %edi
+
+ popl %ebp
+ ret
+
+
+/*
+ * int gfx_input (gfx_data_t *gfx_data, int *menu_entry)
+ *
+ * let user enter a command line
+ *
+ * uses gfx_data->cmdline as buffer
+ *
+ * return values:
+ * 1: abort
+ * 2: boot
+ * menu_entry: selected entry
+ */
+
+ENTRY(gfx_input)
+ pushl %ebp
+ movl %esp, %ebp
+
+ pushl %edi
+ pushl %esi
+ pushl %ebx
+
+ movl 8(%ebp),%edx
+ movl %edx,%ebx
+ leal gfx_ofs_sys_cfg(%edx),%esi
+ andl $0xf,%ebx
+ shrl $4,%edx
+
+ pushl %ebp
+
+ call EXT_C(prot_to_real)
+ .code16
+
+ pushw %ds
+
+ movw %dx,%ds
+
+ movl gfx_ofs_cmdline(%bx),%edi
+ movl gfx_ofs_cmdline_len(%bx),%ecx
+ movl gfx_ofs_timeout(%bx),%eax
+ imull $18,%eax
+
+ lcall *gfx_ofs_jmp_table + 4 * 2 (%bx)
+
+ movl %eax,%ecx
+
+ popw %ds
+
+ DATA32 call EXT_C(real_to_prot)
+ .code32
+
+ popl %ebp
+
+ movl 12(%ebp),%edx
+ movl %ebx,(%edx)
+
+ movl %ecx,%eax
+
+ popl %ebx
+ popl %esi
+ popl %edi
+
+ popl %ebp
+ ret
+
+
+/*
+ * int gfx_setup_menu (gfx_data_t *gfx_data)
+ *
+ * draw boot menu
+ *
+ * return values:
+ * always 0
+ */
+
+/* menu entry descriptor */
+#define menu_entries 0
+#define menu_default 2 /* seg:ofs */
+#define menu_ent_list 6 /* seg:ofs */
+#define menu_ent_size 10
+#define menu_arg_list 12 /* seg:ofs */
+#define menu_arg_size 16
+#define sizeof_menu_desc 18
+
+ENTRY(gfx_setup_menu)
+ pushl %ebp
+ movl %esp, %ebp
+
+ pushl %edi
+ pushl %esi
+ pushl %ebx
+
+ movl 8(%ebp),%edx
+ movl %edx,%ebx
+ andl $0xf,%ebx
+ shrl $4,%edx
+
+ call EXT_C(prot_to_real)
+ .code16
+
+ pushw %ds
+
+ movw %dx,%ds
+ shll $4,%edx
+
+ subw $sizeof_menu_desc,%sp
+ movw %esp,%ebp
+
+ movl gfx_ofs_menu_entries(%bx),%eax
+ movw %ax,menu_entries(%bp)
+
+ movl gfx_ofs_menu_default_entry(%bx),%eax
+ subl %edx,%eax
+ movw %ax,menu_default(%bp)
+ movw %ds,menu_default+2(%bp)
+
+ movl gfx_ofs_menu_list(%bx),%eax
+ subl %edx,%eax
+ movw %ax,menu_ent_list(%bp)
+ movw %ds,menu_ent_list+2(%bp)
+
+ movl gfx_ofs_menu_entry_len(%bx),%eax
+ movw %ax,menu_ent_size(%bp)
+
+ movl gfx_ofs_args_list(%bx),%eax
+ subl %edx,%eax
+ movw %ax,menu_arg_list(%bp)
+ movw %ds,menu_arg_list+2(%bp)
+
+ movl gfx_ofs_args_entry_len(%bx),%eax
+ movw %ax,menu_arg_size(%bp)
+
+ movl %ss,%esi
+ shll $4,%esi
+ addl %ebp,%esi
+
+ lcall %ds: *gfx_ofs_jmp_table + 4 * 3 (%bx)
+
+ addw $sizeof_menu_desc,%sp
+
+ popw %ds
+
+ DATA32 call EXT_C(real_to_prot)
+ .code32
+
+ xorl %eax,%eax
+
+ popl %ebx
+ popl %esi
+ popl %edi
+
+ popl %ebp
+ ret
+
+
+/*
+ *
+ * end graphics stuff
+ *
+ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ */
+
/*
* gateA20(int linear)
--- stage2/builtins.c
+++ stage2/builtins.c
@@ -63,6 +63,8 @@
int fallback_entries[MAX_FALLBACK_ENTRIES];
/* The number of current entry. */
int current_entryno;
+/* graphics file */
+char graphics_file[64];
/* The address for Multiboot command-line buffer. */
static char *mb_cmdline;
/* The password. */
@@ -1351,6 +1353,26 @@
};
+/* graphics */
+static int
+gfxmenu_func (char *arg, int flags)
+{
+ memmove(graphics_file, arg, sizeof graphics_file - 1);
+ graphics_file[sizeof graphics_file - 1] = 0;
+
+ return 0;
+}
+
+static struct builtin builtin_gfxmenu =
+{
+ "gfxmenu",
+ gfxmenu_func,
+ BUILTIN_MENU | BUILTIN_HELP_LIST,
+ "gfxmenu FILE",
+ "Use the graphical menu from FILE."
+};
+
+
/* geometry */
static int
geometry_func (char *arg, int flags)
@@ -4874,6 +4896,7 @@
&builtin_find,
&builtin_fstest,
&builtin_geometry,
+ &builtin_gfxmenu,
&builtin_halt,
&builtin_help,
&builtin_hiddenmenu,
--- stage2/shared.h
+++ stage2/shared.h
@@ -374,6 +374,22 @@
#endif /* WITHOUT_LIBC_STUBS */
+/* see typedef gfx_data_t below */
+#define gfx_ofs_ok 0x00
+#define gfx_ofs_code_seg 0x04
+#define gfx_ofs_jmp_table 0x08
+#define gfx_ofs_sys_cfg 0x38
+#define gfx_ofs_cmdline 0x6c
+#define gfx_ofs_cmdline_len 0x70
+#define gfx_ofs_menu_list 0x74
+#define gfx_ofs_menu_default_entry 0x78
+#define gfx_ofs_menu_entries 0x7c
+#define gfx_ofs_menu_entry_len 0x80
+#define gfx_ofs_args_list 0x84
+#define gfx_ofs_args_entry_len 0x88
+#define gfx_ofs_timeout 0x8c
+
+
#ifndef ASM_FILE
/*
* Below this should be ONLY defines and other constructs for C code.
@@ -595,6 +611,38 @@
extern int default_entry;
extern int current_entryno;
+
+/*
+ * graphics menu stuff
+ *
+ * Note: gfx_data and all data referred to in it must lie within a 64k area.
+ */
+typedef struct {
+ unsigned ok; /* set while we're in graphics mode */
+ unsigned code_seg; /* code segment of binary graphics code */
+ unsigned jmp_table[12]; /* link to graphics functions */
+ unsigned char sys_cfg[52]; /* sys_cfg[0]: identifies boot loader (grub == 2) */
+ char *cmdline; /* command line returned by gfx_input() */
+ unsigned cmdline_len; /* length of the above */
+ char *menu_list; /* list of menu entries, each of fixed length (menu_entry_len) */
+ char *menu_default_entry; /* the default entry */
+ unsigned menu_entries; /* number of entries in menu_list */
+ unsigned menu_entry_len; /* one entry */
+ char *args_list; /* same structure as menu_list, menu_entries entries */
+ unsigned args_entry_len; /* one entry */
+ unsigned timeout; /* in seconds (0: no timeout) */
+} __attribute__ ((packed)) gfx_data_t;
+
+extern gfx_data_t *graphics_data;
+
+/* pointer to graphics image data */
+extern char graphics_file[64];
+
+int gfx_init(gfx_data_t *gfx_data);
+int gfx_done(gfx_data_t *gfx_data);
+int gfx_input(gfx_data_t *gfx_data, int *menu_entry);
+int gfx_setup_menu(gfx_data_t *gfx_data);
+
/* The constants for password types. */
typedef enum
{
--- stage2/stage2.c
+++ stage2/stage2.c
@@ -22,6 +22,8 @@
grub_jmp_buf restart_env;
+gfx_data_t *graphics_data;
+
#if defined(PRESET_MENU_STRING) || defined(SUPPORT_DISKLESS)
# if defined(PRESET_MENU_STRING)
@@ -310,6 +312,12 @@
if (! auth && password)
{
+ if (*graphics_file)
+ {
+ printf ("\
+ WARNING: graphical menu doesn\'t work\
+ in conjunction with the password feature\n" );
+ }
printf ("\
Press enter to boot the selected OS or \'p\' to enter a\n\
password to unlock the next set of features.");
@@ -753,6 +761,493 @@
}
+
+#if 0
+/* for debugging */
+static void hexdump(unsigned char *buf, unsigned len)
+{
+ int i, j = 0;
+ char s[17];
+ unsigned addr = (unsigned) buf;
+
+ s[16] = 0;
+ while(len--) {
+ i = buf[j];
+ i = i & 0xff;
+ s[j & 15] = (i >= 0x20 && i <= 0x7e) ? i : '.';
+ if(!(j & 15)) {
+ printf("%x ", j + addr);
+ }
+ if(!(j & 7) && (j & 15)) printf(" ");
+ /* stupid grub_printf */
+ printf("%x", (i >> 4) & 0x0f);
+ printf("%x ", i & 0x0f);
+ if(!(++j & 15)) {
+ printf(" %s\n", s);
+ }
+ }
+
+ if(j & 15) {
+ s[j & 15] = 0;
+ if(!(j & 8)) printf(" ");
+ i = 1 + 3 * (16 - (j & 15));
+ while(i--) printf(" ");
+ printf("%s\n", s);
+ }
+}
+#endif
+
+
+/* kernel + (grub-)module options */
+#define GFX_CMD_BUF_SIZE 512
+
+/* command line separator char */
+#define GFX_CMD_SEP 1
+
+/*
+ * Go through config entry and find kernel args, if any.
+ * Put things into buf and return it.
+ */
+static char *get_kernel_args(char *cfg, char *buf)
+{
+ int i, j;
+ char *s, *t = "", *p, *t2;
+
+ *(p = buf) = 0;
+
+ for(j = 0; ; j++) {
+ s = get_entry(cfg, j, 0);
+ if(!*s) break;
+ if(
+ (!memcmp(s, "kernel", 6) || !memcmp(s, "module", 6)) &&
+ (s[6] == ' ' || s[6] == '\t')
+ ) {
+ t = skip_to(0, s);
+ t2 = s[0] == 'm' ? strstr(t, "initrd") : NULL;
+ if(*t) t = skip_to(0, t);
+ if(t2 && t2 < t) break; /* module is likely a normal initrd -> skip */
+ i = strlen(t);
+ if(p - buf + i > GFX_CMD_BUF_SIZE - 2) break;
+ *p++ = GFX_CMD_SEP;
+ strcpy(p, t);
+ p += i;
+
+ continue;
+ }
+ }
+
+ if(*buf) buf++; /* skip initial separator char */
+
+ return buf;
+}
+
+
+/*
+ * Check header and return code start offset.
+ */
+static unsigned magic_ok(unsigned char *buf)
+{
+ if(
+ *(unsigned *) buf == 0x0b2d97f00 && /* magic id */
+ (buf[4] == 8) /* version 8 */
+ ) {
+ return *(unsigned *) (buf + 8);
+ }
+
+ return 0;
+}
+
+
+/*
+ * Search cpio archive for gfx file.
+ */
+static unsigned find_file(unsigned char *buf, unsigned len, unsigned *gfx_file_start, unsigned *file_len)
+{
+ unsigned i, fname_len, code_start = 0;
+
+ *gfx_file_start = 0;
+
+ for(i = 0; i < len;) {
+ if((len - i) >= 0x1a && (buf[i] + (buf[i + 1] << 8)) == 0x71c7) {
+ fname_len = *(unsigned short *) (buf + i + 20);
+ *file_len = *(unsigned short *) (buf + i + 24) + (*(unsigned short *) (buf + i + 22) << 16);
+ i += 26 + fname_len;
+ i = ((i + 1) & ~1);
+ if((code_start = magic_ok(buf + i))) {
+ *gfx_file_start = i;
+ return code_start;
+ }
+ i += *file_len;
+ i = ((i + 1) & ~1);
+ }
+ else {
+ break;
+ }
+ }
+
+ return code_start;
+}
+
+static inline unsigned char * stack_ptr(void)
+{
+ unsigned char * u;
+
+ asm("movl %%esp, %0" : "=r" (u));
+
+ return u;
+}
+
+static void sleep(int delay)
+{
+ int tick, last_tick = currticks();
+
+ delay *= 18;
+
+ while(delay--) {
+ while((tick = currticks()) == last_tick) { }
+ last_tick = tick;
+ }
+}
+
+static void wait_for_key()
+{
+ printf("Press a key to continue...");
+ getkey();
+ printf("\r \r");
+}
+
+
+/*
+ * Leave that much space on the heap. Everything else goes to the graphics
+ * functions.
+ *
+ * 0x2000 is _not_ enough
+ */
+#define MIN_HEAP_SIZE 0x4000
+#define MIN_GFX_FREE 0x1000
+
+#define SC_BOOTLOADER 0
+#define SC_FAILSAFE 3
+#define SC_SYSCONFIG_SIZE 4
+#define SC_BOOTLOADER_SEG 8
+#define SC_XMEM_0 24
+#define SC_XMEM_1 26
+#define SC_XMEM_2 28
+#define SC_XMEM_3 30
+#define SC_FILE 32
+#define SC_ARCHIVE_START 36
+#define SC_ARCHIVE_END 40
+#define SC_MEM0_START 44
+#define SC_MEM0_END 48
+
+/*
+ * Does normally not return.
+ */
+static void
+run_graphics_menu (char *menu_entries, char *config_entries, int num_entries,
+ char *heap, int entryno)
+{
+ unsigned char *buf, *buf_ext;
+ unsigned buf_size, buf_ext_size, code_start, file_start;
+ char *s, *t, *t2, *cfg, *new_config, *p;
+ char *saved_heap;
+ int i, j, max_len, gfx_file_size, verbose;
+ int selected_entry;
+ gfx_data_t *gfx_data;
+ char *cmd_buf;
+ unsigned mem0_start, mem0_end, file_len;
+
+ /*
+ * check gfx_data_t struct offsets for consistency; gcc will optimize away
+ * the whole block
+ */
+
+ /* dummy function to make ld fail */
+ {
+ extern void wrong_struct_size(void);
+ #define gfx_ofs_check(a) if(gfx_ofs_##a != (char *) &gfx_data->a - (char *) gfx_data) wrong_struct_size();
+ gfx_ofs_check(ok);
+ gfx_ofs_check(code_seg);
+ gfx_ofs_check(jmp_table);
+ gfx_ofs_check(sys_cfg);
+ gfx_ofs_check(cmdline);
+ gfx_ofs_check(cmdline_len);
+ gfx_ofs_check(menu_list);
+ gfx_ofs_check(menu_default_entry);
+ gfx_ofs_check(menu_entries);
+ gfx_ofs_check(menu_entry_len);
+ gfx_ofs_check(args_list);
+ gfx_ofs_check(args_entry_len);
+ gfx_ofs_check(timeout);
+ #undef gfx_ofs_check
+ }
+
+ if(!num_entries) return;
+
+ graphics_data = gfx_data = (gfx_data_t *) heap;
+ heap += sizeof *gfx_data;
+ memset(gfx_data, 0, sizeof *gfx_data);
+
+ gfx_data->sys_cfg[SC_BOOTLOADER] = 2; /* bootloader: grub */
+ gfx_data->sys_cfg[SC_SYSCONFIG_SIZE] = 52; /* config data size */
+ *(unsigned short *) (gfx_data->sys_cfg + SC_BOOTLOADER_SEG) = (unsigned) gfx_data >> 4; /* segment */
+ gfx_data->sys_cfg[SC_XMEM_0] = 0x21; /* 1MB @ 2MB */
+ gfx_data->sys_cfg[SC_XMEM_1] = 0x41; /* 1MB @ 4MB */
+ verbose = (*(unsigned char *) 0x417) & 3 ? 1 : 0; /* SHIFT pressed */
+ gfx_data->sys_cfg[SC_FAILSAFE] = verbose;
+
+ gfx_data->timeout = grub_timeout >= 0 ? grub_timeout : 0;
+
+
+ /* setup command line edit buffer */
+
+ gfx_data->cmdline_len = 256;
+
+ gfx_data->cmdline = heap;
+ heap += gfx_data->cmdline_len;
+ memset(gfx_data->cmdline, 0, gfx_data->cmdline_len);
+
+ cmd_buf = heap;
+ heap += GFX_CMD_BUF_SIZE;
+
+ /* setup menu entries */
+
+ for(i = max_len = 0; i < num_entries; i++) {
+ j = strlen(get_entry(menu_entries, i, 0));
+ if(j > max_len) max_len = j;
+ }
+
+ if(!max_len) return;
+
+ gfx_data->menu_entry_len = max_len + 1;
+ gfx_data->menu_entries = num_entries;
+
+ gfx_data->menu_list = heap;
+ heap += gfx_data->menu_entry_len * gfx_data->menu_entries;
+
+ memset(gfx_data->menu_list, 0, gfx_data->menu_entry_len * gfx_data->menu_entries);
+
+ for(i = 0; i < (int) gfx_data->menu_entries; i++) {
+ strcpy(gfx_data->menu_list + i * gfx_data->menu_entry_len, get_entry(menu_entries, i, 0));
+ }
+
+ gfx_data->menu_default_entry = gfx_data->menu_list + entryno * gfx_data->menu_entry_len;
+
+
+ /* setup list of kernel args */
+
+ for(i = max_len = 0; i < num_entries; i++) {
+ s = get_kernel_args(get_entry(config_entries, i, 1), cmd_buf);
+ j = strlen(s);
+ if(j > max_len) max_len = j;
+ }
+
+ gfx_data->args_entry_len = max_len + 1;
+
+ gfx_data->args_list = heap;
+ heap += gfx_data->args_entry_len * gfx_data->menu_entries;
+
+ memset(gfx_data->args_list, 0, gfx_data->args_entry_len * gfx_data->menu_entries);
+
+ for(i = 0; i < (int) gfx_data->menu_entries; i++) {
+ strcpy(gfx_data->args_list + i* gfx_data->args_entry_len, get_kernel_args(get_entry(config_entries, i, 1), cmd_buf));
+ }
+
+
+ /* go back here when we no longer need the graphics data */
+ saved_heap = heap;
+
+
+ /* get memory area to be used by graphics functions */
+
+ /* use 1MB starting at 2MB as file buffer */
+ buf_ext = (unsigned char *) (2 << 20);
+ buf_ext_size = 1 << 20;
+
+ /* must be 16-byte aligned */
+ buf = (unsigned char *) (((unsigned) heap + 0xf) & ~0xf);
+
+ buf_size = stack_ptr() - buf - MIN_HEAP_SIZE;
+ buf_size &= ~0xf;
+
+ mem0_start = (unsigned) buf;
+ mem0_end = mem0_start + buf_size;
+
+ if(verbose) {
+ printf("low memory 0x%x - 0x%x (%d bytes)\n", mem0_start, mem0_end, buf_size);
+ wait_for_key();
+ }
+
+ heap += buf_size;
+
+ /* read the file */
+
+ if(!grub_open(graphics_file)) {
+ printf("%s: file not found\n", graphics_file);
+ sleep(5);
+ heap = saved_heap;
+ return;
+ }
+
+ gfx_file_size = grub_read(buf_ext, buf_ext_size);
+
+ grub_close();
+
+ if(gfx_file_size <= 0) {
+ printf("%s: read error\n", graphics_file);
+ sleep(5);
+ heap = saved_heap;
+ return;
+ }
+
+ if(verbose) {
+ printf("%s: %d bytes (%d bytes left)\n", graphics_file, gfx_file_size, buf_ext_size - gfx_file_size);
+ wait_for_key();
+ }
+
+ /* locate file inside cpio archive */
+ if(!(code_start = find_file(buf_ext, gfx_file_size, &file_start, &file_len))) {
+ printf("%s: invalid file format\n", graphics_file);
+ sleep(5);
+ heap = saved_heap;
+ return;
+ }
+
+ if(verbose) {
+ printf("init: start 0x%x, len %d; code offset 0x%x\n", file_start, file_len, code_start);
+ wait_for_key();
+ }
+
+ if(file_len - code_start + MIN_GFX_FREE > buf_size) {
+ printf("not enough free memory: %d extra bytes need\n", file_len - code_start + MIN_GFX_FREE - buf_size);
+ sleep(5);
+ heap = saved_heap;
+ return;
+ }
+
+ memcpy((void *) buf, (void *) (buf_ext + file_start + code_start), file_len - code_start);
+
+ mem0_start += file_len - code_start;
+ mem0_start = (mem0_start + 3) & ~3; /* align */
+
+ /* init interface to graphics functions */
+
+ *(unsigned *) (gfx_data->sys_cfg + SC_FILE) = (unsigned) buf_ext + file_start;
+ *(unsigned *) (gfx_data->sys_cfg + SC_ARCHIVE_START) = (unsigned) buf_ext;
+ *(unsigned *) (gfx_data->sys_cfg + SC_ARCHIVE_END) = (unsigned) buf_ext + gfx_file_size;
+ *(unsigned *) (gfx_data->sys_cfg + SC_MEM0_START) = mem0_start;
+ *(unsigned *) (gfx_data->sys_cfg + SC_MEM0_END) = mem0_end;
+
+ gfx_data->code_seg = (unsigned) buf >> 4;
+
+ if(verbose) {
+ printf("init 0x%x, archive 0x%x - 0x%x, low mem 0x%x - 0x%x\ncode seg 0x%x\n",
+ (unsigned) buf_ext + file_start,
+ (unsigned) buf_ext, (unsigned) buf_ext + gfx_file_size,
+ mem0_start, mem0_end, gfx_data->code_seg
+ );
+ wait_for_key();
+ }
+
+ for(i = 0; (unsigned) i < sizeof gfx_data->jmp_table / sizeof *gfx_data->jmp_table; i++) {
+ gfx_data->jmp_table[i] = (gfx_data->code_seg << 16) + ((unsigned short *) buf)[i];
+ }
+
+ if(verbose) {
+ for(i = 0; i < 12; i++) {
+ printf("%d: 0x%x\n", i, gfx_data->jmp_table[i]);
+ }
+
+ for(i = 0; i < gfx_data->menu_entries; i++) {
+ printf("\"%s\" -- \"%s\"\n",
+ gfx_data->menu_list + i * gfx_data->menu_entry_len,
+ gfx_data->args_list + i * gfx_data->args_entry_len
+ );
+ }
+
+ printf("default: \"%s\"\n", gfx_data->menu_default_entry);
+ wait_for_key();
+ }
+
+ /* switch to graphics mode */
+
+ if(gfx_init(gfx_data)) {
+ printf("graphics initialization failed\n");
+ sleep(5);
+ heap = saved_heap;
+ return;
+ }
+
+ gfx_setup_menu(gfx_data);
+
+ i = gfx_input(gfx_data, &selected_entry);
+
+ /* ESC -> show text menu */
+ if(i == 1) {
+ gfx_done(gfx_data);
+ grub_timeout = -1;
+
+ heap = saved_heap;
+ return;
+ }
+
+ gfx_done(gfx_data);
+
+ heap = saved_heap; /* free most of the graphics data */
+
+ // printf("cmdline: >%s<, entry = %d\n", gfx_data->cmdline, selected_entry);
+
+ if(selected_entry < 0 || selected_entry > num_entries) return;
+
+
+ /* create new config with modified kernel option */
+
+ cfg = get_entry(config_entries, selected_entry, 1);
+
+ new_config = heap;
+
+ for(p = gfx_data->cmdline, i = 0; ; i++) {
+ s = get_entry(cfg, i, 0);
+ if(!*s) {
+ if(!i) *heap++ = 0;
+ *heap++ = 0;
+ break;
+ }
+ /* note: must match get_kernel_args() */
+ if(
+ (!memcmp(s, "kernel", 6) || !memcmp(s, "module", 6)) &&
+ (s[6] == ' ' || s[6] == '\t')
+ ) {
+ t = skip_to(0, s);
+ t2 = s[0] == 'm' ? strstr(t, "initrd") : NULL;
+ if(*t) t = skip_to(0, t);
+ if(t2 && t2 < t) { /* module is likely a normal initrd -> skip */
+ strcpy(heap, s);
+ heap += strlen(s) + 1;
+ continue;
+ }
+ memmove(heap, s, t - s);
+ heap += t - s;
+ *heap++ = ' ';
+ while(*p && *p != GFX_CMD_SEP) *heap++ = *p++;
+ *heap++ = 0;
+ if(*p == GFX_CMD_SEP) p++;
+ }
+ else {
+ strcpy(heap, s);
+ heap += strlen(s) + 1;
+ }
+ }
+
+ *heap++ = 0;
+
+ // hexdump(new_config, heap - new_config);
+ // getkey();
+
+ run_script(new_config, heap);
+}
+
+
static int
get_line_from_config (char *cmdline, int maxlen, int read_from_file)
{
@@ -1062,9 +1557,12 @@
}
else
{
- /* Run menu interface. */
- run_menu (menu_entries, config_entries, num_entries,
- menu_entries + menu_len, default_entry);
+ if (*graphics_file && !password && show_menu && grub_timeout)
+ {
+ run_graphics_menu(menu_entries, config_entries, num_entries,menu_entries + menu_len, default_entry);
+ }
+ /* Run menu interface. */
+ run_menu (menu_entries, config_entries, num_entries, menu_entries + menu_len, default_entry);
}
}
}

12
src/patches/grub-0.97/grub-linux-setup-fix Normal file
View File

@@ -0,0 +1,12 @@
--- grub-0.95/stage2/builtins.c.orig 2004-05-14 21:30:52.000000000 +0200
+++ grub-0.95/stage2/builtins.c 2005-03-02 17:01:27.568051824 +0100
@@ -3884,6 +3884,9 @@
}
}
+ /* force buffer cache invalidation after embedding */
+ buf_drive = -1;
+
/* Construct a string that is used by the command "install" as its
arguments. */
sprint_device (installed_drive, installed_partition);

152
src/patches/grub-0.97/grub-path-cfg.diff Normal file
View File

@@ -0,0 +1,152 @@
diff -ru ../grub-0.97-save/docs/grub.8 ./docs/grub.8
--- ../grub-0.97-save/docs/grub.8 2005-05-08 04:48:56.000000000 +0200
+++ ./docs/grub.8 2006-09-18 21:26:18.800377712 +0200
@@ -15,7 +15,7 @@
specify stage2 boot_drive [default=0x0]
.TP
\fB\-\-config\-file\fR=\fIFILE\fR
-specify stage2 config_file [default=/boot/grub/menu.lst]
+specify stage2 config_file [default=/boot/grub/grub.conf]
.TP
\fB\-\-device\-map\fR=\fIFILE\fR
use the device map file FILE
diff -ru ../grub-0.97-save/docs/grub.texi ./docs/grub.texi
--- ../grub-0.97-save/docs/grub.texi 2006-09-16 21:29:53.000000000 +0200
+++ ./docs/grub.texi 2006-09-18 21:29:54.573575200 +0200
@@ -687,7 +687,7 @@
For booting from a CD-ROM, GRUB uses a special Stage 2 called
@file{stage2_eltorito}. The only GRUB files you need to have in your
bootable CD-ROM are this @file{stage2_eltorito} and optionally a config file
-@file{menu.lst}. You don't need to use @file{stage1} or @file{stage2},
+@file{grub.conf}. You don't need to use @file{stage1} or @file{stage2},
because El Torito is quite different from the standard boot process.
Here is an example of procedures to make a bootable CD-ROM
@@ -710,7 +710,7 @@
$ @kbd{cp /usr/share/grub/i386-pc/stage2_eltorito iso/boot/grub}
@end example
-If desired, make the config file @file{menu.lst} under @file{iso/boot/grub}
+If desired, make the config file @file{grub.conf} under @file{iso/boot/grub}
(@pxref{Configuration}), and copy any files and directories for the disc to the
directory @file{iso/}.
@@ -1265,7 +1265,7 @@
keys) that will do everything to boot an OS.
To enable the menu, you need a configuration file,
-@file{menu.lst} under the boot directory. We'll analyze an example
+@file{grub.conf} under the boot directory. We'll analyze an example
file.
The file first contains some general settings, the menu interface
@@ -1538,7 +1538,7 @@
foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\
:bf=/nbgrub:\
:tc=.allhost:\
- :T150="(nd)/tftpboot/menu.lst.foo":
+ :T150="(nd)/tftpboot/grub.conf.foo":
@end group
@end example
@@ -1882,8 +1882,8 @@
An absolute file name resembles a Unix absolute file name, using
@samp{/} for the directory separator (not @samp{\} as in DOS). One
-example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
-@file{/boot/grub/menu.lst} in the first partition of the first hard
+example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
+@file{/boot/grub/grub.conf} in the first partition of the first hard
disk. If you omit the device name in an absolute file name, GRUB uses
GRUB's @dfn{root device} implicitly. So if you set the root device to,
say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
@@ -3559,7 +3559,7 @@
@item --config-file=@var{file}
Read the configuration file @var{file} instead of
-@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
+@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
syntax. See @ref{Filesystem}, for more information.
@item --boot-drive=@var{drive}
diff -ru ../grub-0.97-save/grub/asmstub.c ./grub/asmstub.c
--- ../grub-0.97-save/grub/asmstub.c 2006-09-16 21:29:52.000000000 +0200
+++ ./grub/asmstub.c 2006-09-18 21:31:08.793292088 +0200
@@ -73,7 +73,7 @@
unsigned long boot_drive = 0;
int saved_entryno = 0;
char version_string[] = VERSION;
-char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
+char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
unsigned long linux_text_len = 0;
char *linux_data_tmp_addr = 0;
char *linux_data_real_addr = 0;
diff -ru ../grub-0.97-save/stage1/Makefile.am ./stage1/Makefile.am
--- ../grub-0.97-save/stage1/Makefile.am 2006-09-16 21:29:52.000000000 +0200
+++ ./stage1/Makefile.am 2006-09-18 21:09:46.550222664 +0200
@@ -1,4 +1,4 @@
-pkglibdir = /usr/lib/grub
+pkglibdir = /usr/share/grub/i386-pc
nodist_pkglib_DATA = stage1
CLEANFILES = $(nodist_pkglib_DATA)
#diff -ru ../grub-0.97-save/stage1/Makefile.in ./stage1/Makefile.in
#--- ../grub-0.97-save/stage1/Makefile.in 2006-09-16 21:30:10.000000000 +0200
#+++ ./stage1/Makefile.in 2006-09-18 21:10:36.337653824 +0200
#@@ -66,7 +66,7 @@
# ETAGS = etags
# CTAGS = ctags
# DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#-pkglibdir = /usr/lib/grub
#+pkglibdir = /usr/share/grub/i386-pc
# ACLOCAL = @ACLOCAL@
# AMDEP_FALSE = @AMDEP_FALSE@
# AMDEP_TRUE = @AMDEP_TRUE@
diff -ru ../grub-0.97-save/stage2/Makefile.am ./stage2/Makefile.am
--- ../grub-0.97-save/stage2/Makefile.am 2006-09-16 21:29:52.000000000 +0200
+++ ./stage2/Makefile.am 2006-09-18 21:11:46.148041032 +0200
@@ -27,7 +27,7 @@
-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
# Stage 2 and Stage 1.5's.
-pkglibdir = /usr/lib/grub
+pkglibdir = /usr/share/grub/i386-pc
EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
#diff -ru ../grub-0.97-save/stage2/Makefile.in ./stage2/Makefile.in
#--- ../grub-0.97-save/stage2/Makefile.in 2006-09-16 21:30:12.000000000 +0200
#+++ ./stage2/Makefile.in 2006-09-18 21:12:09.087553696 +0200
#@@ -442,7 +442,7 @@
# DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#
# # Stage 2 and Stage 1.5's.
#-pkglibdir = /usr/lib/grub
#+pkglibdir = /usr/share/grub/i386-pc
# ACLOCAL = @ACLOCAL@
# AMDEP_FALSE = @AMDEP_FALSE@
# AMDEP_TRUE = @AMDEP_TRUE@
diff -ru ../grub-0.97-save/stage2/asm.S ./stage2/asm.S
--- ../grub-0.97-save/stage2/asm.S 2006-09-16 21:29:52.000000000 +0200
+++ ./stage2/asm.S 2006-09-18 21:31:53.404510152 +0200
@@ -98,7 +98,7 @@
.string VERSION
VARIABLE(config_file)
#ifndef STAGE1_5
- .string "/boot/grub/menu.lst"
+ .string "/boot/grub/grub.conf"
#else /* STAGE1_5 */
.long 0xffffffff
.string "/boot/grub/stage2"
diff -ru ../grub-0.97-save/stage2/builtins.c ./stage2/builtins.c
--- ../grub-0.97-save/stage2/builtins.c 2006-09-16 21:29:52.000000000 +0200
+++ ./stage2/builtins.c 2006-09-18 21:32:39.562493072 +0200
@@ -4022,7 +4022,7 @@
/* The prefix was determined. */
grub_sprintf (stage2, "%s%s", prefix, "/stage2");
- grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
+ grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
*real_config_filename = 0;
/* Check if stage2 exists. */

15
src/patches/grub-0.97/use_ferror.diff Normal file
View File

@@ -0,0 +1,15 @@
Fread doesn't return -1 on error, so use ferror().
--- util/mbchk.c.old Tue Jan 22 18:36:17 2002
+++ util/mbchk.c Tue Jan 22 18:28:54 2002
@@ -59,7 +59,9 @@ check_multiboot (const char *filename, F
int i;
char buf[8192];
- if (fread (buf, 1, 8192, fp) < 0)
+ fread (buf, 1, 8192, fp);
+
+ if (ferror(fp))
{
fprintf (stderr, "%s: Read error.\n", filename);
return 0;