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

Hinzugefügt:

Browse Source 
* GFXBoot - experimental


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@244 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-08-12 15:16:04 +00:00
parent ae179f6ea6
commit 27996c53e7
21 changed files with 3285 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/aboot/scsiaboot.conf
View File

@@ -1 +1 @@
0:1/vmlinuz root=ROOT panic=10 initrd=ipcoprd.img init=/linuxrc rw
0:1/vmlinuz root=ROOT panic=10 initrd=ipfirerd.img init=/linuxrc rw

24
config/grub/grub.conf
View File

@@ -1,45 +1,47 @@
timeout 5
default saved
timeout 10
#default saved
foreground = 16064e
background = ffffff
splashimage (hd0,0)/grub/ipfire.xpm.gz
gfxmenu /grub/message
#hiddenmenu
#splashimage (hd0,0)/grub/ipfire.xpm.gz
title IPFire (1024x768)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 acpi=off vga=791 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault
title IPFire (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 acpi=off vga=785 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault
title IPFire SMP (1024x768)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault
title IPFire SMP (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault
title IPFire (ACPI enabled) (1024x768)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault
title IPFire (ACPI enabled) (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault
title IPFire SMP (ACPI HT enabled) (1024x768)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault
title IPFire SMP (ACPI HT enabled) (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
initrd /initrd.splash
savedefault
#savedefault

BIN
config/grub/message Normal file
View File

Binary file not shown.

24
config/grub/scsigrub.conf
View File

@@ -1,45 +1,47 @@
timeout 5
default saved
timeout 10
#default saved
foreground = 16064e
background = ffffff
splashimage (hd0,0)/grub/ipfire.xpm.gz
gfxmenu /grub/message
#hiddenmenu
#splashimage (hd0,0)/grub/ipfire.xpm.gz
title IPFire (1024x768)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
initrd /ipfirerd.img
savedefault
#savedefault
title IPFire (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=785 splash=silent rw
initrd /ipfirerd.img
savedefault
#savedefault
title IPFire SMP (1024x768)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
#savedefault
title IPFire SMP (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=785 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
#savedefault
title IPFire (ACPI enabled) (1024x768)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
initrd /ipfirerd.img
savedefault
#savedefault
title IPFire (ACPI enabled) (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=785 splash=silent rw
initrd /ipfirerd.img
savedefault
#savedefault
title IPFire SMP (ACPI HT enabled) (1024x768)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
#savedefault
title IPFire SMP (ACPI HT enabled) (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=785 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
#savedefault

1
doc/packages-list.txt
View File

@@ -104,6 +104,7 @@
* grep-2.5.1
* groff-1.19
* grub-0.95
* grub-0.97
* gzip-1.3.5
* hddtemp-0.3-beta14
* hdparm-6.3

46
lfs/grub
View File

@@ -32,7 +32,7 @@
include Config
VER = 0.95
VER = 0.97
THISAPP = grub-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4ca8e4363d5f1980f2c63b7f5cdbe0d1
$(DL_FILE)_MD5 = cd3f3eb54446be6003156158d51f4884
install : $(TARGET)
@@ -80,21 +80,45 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-configfile.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-symlinkmenulst.patch
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.93-endedit.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-append.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-bootonce.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-splashimagehelp.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics-bootterm.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-configfile.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-symlinkmenulst.patch
# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.93-endedit.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-append.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-bootonce.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-splashimagehelp.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics-bootterm.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-special-device-names.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.94-i2o.patch
# cd $(DIR_APP)/netboot && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.93-rtl8139.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-configfile.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-symlinkmenulst.patch
# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.93-endedit.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-append.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-bootonce.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-misc.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-dirs.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-splashimagehelp.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics-bootterm.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-splash.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-wildcards.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.96-PIC.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.96-bounced-checks.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-special-device-names.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.96-i2o-raid.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.94-i2o.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.96-nxstack.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.96-netboot-pic.patch
cd $(DIR_APP)/netboot && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.93-rtl8139.patch
cd $(DIR_APP) && autoreconf --install --force
cd $(DIR_APP) && CFLAGS="-Os -fno-stack-protector" \
STAGE2_CFLAGS="-Os -fno-stack-protector" \
./configure --prefix=/usr \
./configure --prefix=/usr --datadir=/usr/share \
--enable-rtl8139 \
--enable-ne --enable-ne-scan=0x300 \
--disable-nls \

1
src/ROOTFILES.i386
View File

@@ -1267,6 +1267,7 @@ boot/grub/grub.conf
boot/grub/grubbatch
boot/grub/ipfire.xpm.gz
boot/grub/scsigrub.conf
boot/grub/message
#usr/bin/mbchk
usr/sbin/grub
usr/sbin/grub-install

2
src/install+setup/install/grubbatch
View File

@@ -1,6 +1,6 @@
#!/bin/sh
/bin/cp -f /usr/share/grub/i386-pc/* /boot/grub
/usr/sbin/grub --no-floppy --batch <<EOT > /dev/null 2> /dev/null
/usr/sbin/grub --no-floppy --batch <<EOT # > /dev/null 2> /dev/null
device (hd0) DEVICE
root (hd0,0)
setup (hd0,0)

30
src/patches/grub-0.97/README Normal file
View File

@@ -0,0 +1,30 @@
This file describes the patches in the patchsets:
001_all_grub-0.97-misc.patch
Several simple fixes
002_all_grub-0.97-splash.patch
Port of the SuSE's gfxboot patch
003_all_grub-0.97-dirs.patch
FHS compilance
004_all_grub-0.97-wildcards.patch
Port of the SuSE's wildcards patch with custom nice sorting addon
005_all_grub-0.96-PIC.patch:
a patch to fix PIC issues by psm and Kevin F. Quinn in Gentoo bug #80693
010_all_grub-0.96-bounced-checks.patch:
Disables testing of FFS and UFS2 images (which always fail). See Gentoo bug
#71811
020_all_grub-0.96-i2o-raid.patch:
Support i2o RAID. See Gentoo bug #76143
040_all_grub-0.96-nxstack.patch:
Fix NX segfaulting on amd64 and x86_64. The patch is by Peter Jones.
See: http://lists.gnu.org/archive/html/bug-grub/2005-03/msg00011.html
060_all_grub-0.96-netboot-pic.patch
Fix PIC issues in netboot code. See Gentoo bug #85566

71
src/patches/grub-0.97/grub-0.96-PIC.patch Normal file
View File

@@ -0,0 +1,71 @@
--- grub-0.96/stage2/char_io.c.orig 2005-02-18 09:12:39.163407496 +0100
+++ grub-0.96/stage2/char_io.c 2005-02-18 09:13:11.431502000 +0100
@@ -1202,37 +1202,62 @@
}
#endif /* ! STAGE1_5 */
+#ifdef GRUB_UTIL
+# ifdef __PIC__
+# if defined(HAVE_START_SYMBOL) && defined(HAVE_END_SYMBOL)
+ extern char start[];
+ extern char end[];
+# elif defined(HAVE_USCORE_START_SYMBOL) && defined (HAVE_USCORE_END_SYMBOL)
+ extern char _start[];
+ extern char _end[];
+# endif
+# endif
+#endif
int
memcheck (int addr, int len)
{
#ifdef GRUB_UTIL
+# ifdef __PIC__
+# if defined(HAVE_START_SYMBOL) && defined(HAVE_END_SYMBOL)
+ if (start <= addr && end > addr + len)
+ return ! errnum;
+# elif defined(HAVE_USCORE_START_SYMBOL) && defined (HAVE_USCORE_END_SYMBOL)
+ if (_start <= addr && _end > addr + len)
+ return ! errnum;
+# endif
+# else /* __PIC__ */
auto int start_addr (void);
auto int end_addr (void);
auto int start_addr (void)
{
int ret;
-# if defined(HAVE_START_SYMBOL)
+# if defined(HAVE_START_SYMBOL)
asm volatile ("movl $start, %0" : "=a" (ret));
-# elif defined(HAVE_USCORE_START_SYMBOL)
+# elif defined(HAVE_USCORE_START_SYMBOL)
asm volatile ("movl $_start, %0" : "=a" (ret));
-# endif
+# else
+ erk! /* function would return undefined data in this case - barf */
+# endif
return ret;
}
auto int end_addr (void)
{
int ret;
-# if defined(HAVE_END_SYMBOL)
+# if defined(HAVE_END_SYMBOL)
asm volatile ("movl $end, %0" : "=a" (ret));
-# elif defined(HAVE_USCORE_END_SYMBOL)
+# elif defined(HAVE_USCORE_END_SYMBOL)
asm volatile ("movl $_end, %0" : "=a" (ret));
-# endif
+# else
+ erk! /* function would return undefined data in this case - barf */
+# endif
return ret;
}
if (start_addr () <= addr && end_addr () > addr + len)
return ! errnum;
+# endif /* __PIC__ */
#endif /* GRUB_UTIL */
if ((addr < RAW_ADDR (0x1000))

19
src/patches/grub-0.97/grub-0.96-bounced-checks.patch Normal file
View File

@@ -0,0 +1,19 @@
Remove tests that the grub maintainers say can be ignored.
http://lists.gnu.org/archive/html/bug-grub/2004-05/msg00076.html
--- grub-0.96/stage2/size_test
+++ grub-0.96/stage2/size_test
@@ -36,9 +36,9 @@
}
# The bootloader area of a FFS partition is 14 sectors.
-check ffs_stage1_5 7168
-
-check ufs2_stage1_5 7168
+#check ffs_stage1_5 7168
+#
+#check ufs2_stage1_5 7168
# Stage 1.5 can be installed in the sectors immediately after MBR in the
# first cylinder, so the size is (63 - 1) sectors.

61
src/patches/grub-0.97/grub-0.96-i2o-raid.patch Normal file
View File

@@ -0,0 +1,61 @@
diff -ru grub-0.96-orig/lib/device.c grub-0.96/lib/device.c
--- grub-0.96-orig/lib/device.c 2005-02-16 22:33:09.669384408 -0600
+++ grub-0.96/lib/device.c 2005-02-17 00:47:05.127596672 -0600
@@ -407,6 +407,12 @@
{
sprintf (name, "/dev/ataraid/d%c", unit + '0');
}
+
+static void
+get_i2o_disk_name (char *name, int unit)
+{
+ sprintf (name, "/dev/i2o/hd%c", unit + 'a');
+}
#endif
/* Check if DEVICE can be read. If an error occurs, return zero,
@@ -798,6 +804,26 @@
}
}
}
+
+ /* I2O disks. */
+ for (i = 0; i < 8; i++)
+ {
+ char name[16];
+
+ get_i2o_disk_name (name, i);
+ if (check_device (name))
+ {
+ (*map)[num_hd + 0x80] = strdup (name);
+ assert ((*map)[num_hd + 0x80]);
+
+ /* If the device map file is opened, write the map. */
+ if (fp)
+ fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
+
+ num_hd++;
+ }
+ }
+
#endif /* __linux__ */
/* OK, close the device map file if opened. */
@@ -858,8 +884,15 @@
if (strcmp (dev + strlen(dev) - 5, "/disc") == 0)
strcpy (dev + strlen(dev) - 5, "/part");
}
- sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1);
-
+ sprintf (dev + strlen(dev), "%s%d",
+ /* Compaq smart and others */
+ (strncmp(dev, "/dev/ida/", 9) == 0 ||
+ strncmp(dev, "/dev/ataraid/", 13) == 0 ||
+ strncmp(dev, "/dev/cciss/", 11) == 0 ||
+ strncmp(dev, "/dev/rd/", 8) == 0 ||
+ strncmp(dev, "/dev/i2o/", 9) == 0) ? "p" : "",
+ ((partition >> 16) & 0xFF) + 1);
+
/* Open the partition. */
fd = open (dev, O_RDWR);
if (fd < 0)

15
src/patches/grub-0.97/grub-0.96-netboot-pic.patch Normal file
View File

@@ -0,0 +1,15 @@
Patch by the PaX Team to fix PIC/PIE problems.
http://bugs.gentoo.org/show_bug.cgi?id=85566
--- netboot/main.c
+++ netboot/main.c
@@ -701,7 +701,7 @@
"adcw %%ax,%0\n\t" /* add carry of previous iteration */
"loop 1b\n\t"
"adcw $0,%0" /* add carry of last iteration */
- : "=b" (*sum), "=S"(start), "=c"(len)
+ : "=r" (*sum), "=S"(start), "=c"(len)
: "0"(*sum), "1"(start), "2"(len)
: "ax", "cc"
);

617
src/patches/grub-0.97/grub-0.96-nxstack.patch Normal file
View File

@@ -0,0 +1,617 @@
--- grub-0.97/grub/asmstub.c
+++ grub-0.97/grub/asmstub.c
@@ -42,6 +42,7 @@
#include <sys/time.h>
#include <termios.h>
#include <signal.h>
+#include <sys/mman.h>
#ifdef __linux__
# include <sys/ioctl.h> /* ioctl */
@@ -79,7 +80,7 @@
struct apm_info apm_bios_info;
/* Emulation requirements. */
-char *grub_scratch_mem = 0;
+void *grub_scratch_mem = 0;
struct geometry *disks = 0;
@@ -103,14 +104,62 @@
static unsigned int serial_speed;
#endif /* SIMULATE_SLOWNESS_OF_SERIAL */
+/* This allocates page-aligned storage of the specified size, which must be
+ * a multiple of the page size as determined by calling sysconf(_SC_PAGESIZE)
+ */
+#ifdef __linux__
+static void *
+grub_mmap_alloc(size_t len)
+{
+ int mmap_flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_EXECUTABLE;
+
+#ifdef MAP_32BIT
+ mmap_flags |= MAP_32BIT;
+#endif
+ /* Mark the simulated stack executable, as GCC uses stack trampolines
+ * to implement nested functions. */
+ return mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0);
+}
+#else /* !defined(__linux__) */
+static void *
+grub_mmap_alloc(size_t len)
+{
+ int fd = 0, offset = 0, ret = 0;
+ void *pa = MAP_FAILED;
+ char template[] = "/tmp/grub_mmap_alloc_XXXXXX";
+ errno_t e;
+
+ fd = mkstemp(template);
+ if (fd < 0)
+ return pa;
+
+ unlink(template);
+
+ ret = ftruncate(fd, len);
+ if (ret < 0)
+ return pa;
+
+ /* Mark the simulated stack executable, as GCC uses stack trampolines
+ * to implement nested functions. */
+ pa = mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC,
+ MAP_PRIVATE|MAP_EXECUTABLE, fd, offset);
+
+ e = errno;
+ close(fd);
+ errno = e;
+ return pa;
+}
+#endif /* defined(__linux__) */
+
/* The main entry point into this mess. */
int
grub_stage2 (void)
{
/* These need to be static, because they survive our stack transitions. */
static int status = 0;
- static char *realstack;
- char *scratch, *simstack;
+ static void *realstack;
+ void *simstack_alloc_base, *simstack;
+ size_t simstack_size, page_size;
int i;
/* We need a nested function so that we get a clean stack frame,
@@ -140,9 +189,35 @@
}
assert (grub_scratch_mem == 0);
- scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
- assert (scratch);
- grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
+
+ /* Allocate enough pages for 0x100000 + EXTENDED_SIZE + 15, and
+ * make sure the memory is aligned to a multiple of the system's
+ * page size */
+ page_size = sysconf (_SC_PAGESIZE);
+ simstack_size = ( 0x100000 + EXTENDED_MEMSIZE + 15);
+ if (simstack_size % page_size)
+ {
+ /* If we're not on a page_size boundary, round up to the next one */
+ simstack_size &= ~(page_size-1);
+ simstack_size += page_size;
+ }
+
+ /* Add one for a PROT_NONE boundary page at each end. */
+ simstack_size += 2 * page_size;
+
+ simstack_alloc_base = grub_mmap_alloc(simstack_size);
+ assert (simstack_alloc_base != MAP_FAILED);
+
+ /* mark pages above and below our simstack area as innaccessable.
+ * If the implementation we're using doesn't support that, then the
+ * new protection modes are undefined. It's safe to just ignore
+ * them, though. It'd be nice if we knew that we'd get a SEGV for
+ * touching the area, but that's all. it'd be nice to have. */
+ mprotect (simstack_alloc_base, page_size, PROT_NONE);
+ mprotect ((void *)((unsigned long)simstack_alloc_base +
+ simstack_size - page_size), page_size, PROT_NONE);
+
+ grub_scratch_mem = (void *)((unsigned long)simstack_alloc_base + page_size);
/* FIXME: simulate the memory holes using mprot, if available. */
@@ -215,7 +290,7 @@
device_map = 0;
free (disks);
disks = 0;
- free (scratch);
+ munmap(simstack_alloc_base, simstack_size);
grub_scratch_mem = 0;
if (serial_device)
--- grub-0.97/stage2/builtins.c
+++ grub-0.97/stage2/builtins.c
@@ -131,63 +131,98 @@
}
+/* blocklist_read_helper nee disk_read_blocklist_func was a nested
+ * function, to which pointers were taken and exposed globally. Even
+ * in the GNU-C nested functions extension, they have local linkage,
+ * and aren't guaranteed to be accessable *at all* outside of their
+ * containing scope.
+ *
+ * Above and beyond all of that, the variables within blocklist_func_context
+ * are originally local variables, with local (not even static) linkage,
+ * from within blocklist_func. These were each referenced by
+ * disk_read_blocklist_func, which is only called from other functions
+ * through a globally scoped pointer.
+ *
+ * The documentation in GCC actually uses the words "all hell will break
+ * loose" to describe this scenario.
+ *
+ * Also, "start_sector" was also used uninitialized, but gcc doesn't warn
+ * about it (possibly because of the scoping madness?)
+ */
+
+static struct {
+ int start_sector;
+ int num_sectors;
+ int num_entries;
+ int last_length;
+} blocklist_func_context = {
+ .start_sector = 0,
+ .num_sectors = 0,
+ .num_entries = 0,
+ .last_length = 0
+};
+
+/* Collect contiguous blocks into one entry as many as possible,
+ and print the blocklist notation on the screen. */
+static void
+blocklist_read_helper (int sector, int offset, int length)
+{
+ int *start_sector = &blocklist_func_context.start_sector;
+ int *num_sectors = &blocklist_func_context.num_sectors;
+ int *num_entries = &blocklist_func_context.num_entries;
+ int *last_length = &blocklist_func_context.last_length;
+
+ if (*num_sectors > 0)
+ {
+ if (*start_sector + *num_sectors == sector
+ && offset == 0 && *last_length == SECTOR_SIZE)
+ {
+ *num_sectors++;
+ *last_length = length;
+ return;
+ }
+ else
+ {
+ if (*last_length == SECTOR_SIZE)
+ grub_printf ("%s%d+%d", *num_entries ? "," : "",
+ *start_sector - part_start, *num_sectors);
+ else if (*num_sectors > 1)
+ grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "",
+ *start_sector - part_start, *num_sectors-1,
+ *start_sector + *num_sectors-1 - part_start,
+ *last_length);
+ else
+ grub_printf ("%s%d[0-%d]", *num_entries ? "," : "",
+ *start_sector - part_start, *last_length);
+ *num_entries++;
+ *num_sectors = 0;
+ }
+ }
+
+ if (offset > 0)
+ {
+ grub_printf("%s%d[%d-%d]", *num_entries ? "," : "",
+ sector-part_start, offset, offset+length);
+ *num_entries++;
+ }
+ else
+ {
+ *start_sector = sector;
+ *num_sectors = 1;
+ *last_length = length;
+ }
+}
+
/* blocklist */
static int
blocklist_func (char *arg, int flags)
{
char *dummy = (char *) RAW_ADDR (0x100000);
- int start_sector;
- int num_sectors = 0;
- int num_entries = 0;
- int last_length = 0;
-
- auto void disk_read_blocklist_func (int sector, int offset, int length);
-
- /* Collect contiguous blocks into one entry as many as possible,
- and print the blocklist notation on the screen. */
- auto void disk_read_blocklist_func (int sector, int offset, int length)
- {
- if (num_sectors > 0)
- {
- if (start_sector + num_sectors == sector
- && offset == 0 && last_length == SECTOR_SIZE)
- {
- num_sectors++;
- last_length = length;
- return;
- }
- else
- {
- if (last_length == SECTOR_SIZE)
- grub_printf ("%s%d+%d", num_entries ? "," : "",
- start_sector - part_start, num_sectors);
- else if (num_sectors > 1)
- grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "",
- start_sector - part_start, num_sectors-1,
- start_sector + num_sectors-1 - part_start,
- last_length);
- else
- grub_printf ("%s%d[0-%d]", num_entries ? "," : "",
- start_sector - part_start, last_length);
- num_entries++;
- num_sectors = 0;
- }
- }
-
- if (offset > 0)
- {
- grub_printf("%s%d[%d-%d]", num_entries ? "," : "",
- sector-part_start, offset, offset+length);
- num_entries++;
- }
- else
- {
- start_sector = sector;
- num_sectors = 1;
- last_length = length;
- }
- }
+ int *start_sector = &blocklist_func_context.start_sector;
+ int *num_sectors = &blocklist_func_context.num_sectors;
+ int *num_entries = &blocklist_func_context.num_entries;
+
/* Open the file. */
if (! grub_open (arg))
return 1;
@@ -204,15 +241,15 @@
grub_printf (")");
/* Read in the whole file to DUMMY. */
- disk_read_hook = disk_read_blocklist_func;
+ disk_read_hook = blocklist_read_helper;
if (! grub_read (dummy, -1))
goto fail;
/* The last entry may not be printed yet. Don't check if it is a
* full sector, since it doesn't matter if we read too much. */
- if (num_sectors > 0)
- grub_printf ("%s%d+%d", num_entries ? "," : "",
- start_sector - part_start, num_sectors);
+ if (*num_sectors > 0)
+ grub_printf ("%s%d+%d", *num_entries ? "," : "",
+ *start_sector - part_start, *num_sectors);
grub_printf ("\n");
@@ -1868,6 +1905,77 @@
/* install */
+static struct {
+ int saved_sector;
+ int installaddr;
+ int installlist;
+ char *stage2_first_buffer;
+} install_func_context = {
+ .saved_sector = 0,
+ .installaddr = 0,
+ .installlist = 0,
+ .stage2_first_buffer = NULL,
+};
+
+/* Save the first sector of Stage2 in STAGE2_SECT. */
+/* Formerly disk_read_savesect_func with local scope inside install_func */
+static void
+install_savesect_helper(int sector, int offset, int length)
+{
+ if (debug)
+ printf ("[%d]", sector);
+
+ /* ReiserFS has files which sometimes contain data not aligned
+ on sector boundaries. Returning an error is better than
+ silently failing. */
+ if (offset != 0 || length != SECTOR_SIZE)
+ errnum = ERR_UNALIGNED;
+
+ install_func_context.saved_sector = sector;
+}
+
+/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and INSTALLSECT. */
+/* Formerly disk_read_blocklist_func with local scope inside install_func */
+static void
+install_blocklist_helper (int sector, int offset, int length)
+{
+ int *installaddr = &install_func_context.installaddr;
+ int *installlist = &install_func_context.installlist;
+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
+ /* Was the last sector full? */
+ static int last_length = SECTOR_SIZE;
+
+ if (debug)
+ printf("[%d]", sector);
+
+ if (offset != 0 || last_length != SECTOR_SIZE)
+ {
+ /* We found a non-sector-aligned data block. */
+ errnum = ERR_UNALIGNED;
+ return;
+ }
+
+ last_length = length;
+
+ if (*((unsigned long *) (*installlist - 4))
+ + *((unsigned short *) *installlist) != sector
+ || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4)
+ {
+ *installlist -= 8;
+
+ if (*((unsigned long *) (*installlist - 8)))
+ errnum = ERR_WONT_FIT;
+ else
+ {
+ *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4);
+ *((unsigned long *) (*installlist - 4)) = sector;
+ }
+ }
+
+ *((unsigned short *) *installlist) += 1;
+ *installaddr += 512;
+}
+
static int
install_func (char *arg, int flags)
{
@@ -1875,8 +1983,12 @@
char *stage1_buffer = (char *) RAW_ADDR (0x100000);
char *stage2_buffer = stage1_buffer + SECTOR_SIZE;
char *old_sect = stage2_buffer + SECTOR_SIZE;
- char *stage2_first_buffer = old_sect + SECTOR_SIZE;
- char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE;
+ /* stage2_first_buffer used to be defined as:
+ * char *stage2_first_buffer = old_sect + SECTOR_SIZE; */
+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
+ /* and stage2_second_buffer was:
+ * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */
+ char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE;
/* XXX: Probably SECTOR_SIZE is reasonable. */
char *config_filename = stage2_second_buffer + SECTOR_SIZE;
char *dummy = config_filename + SECTOR_SIZE;
@@ -1885,10 +1997,11 @@
int src_drive, src_partition, src_part_start;
int i;
struct geometry dest_geom, src_geom;
- int saved_sector;
+ int *saved_sector = &install_func_context.saved_sector;
int stage2_first_sector, stage2_second_sector;
char *ptr;
- int installaddr, installlist;
+ int *installaddr = &install_func_context.installaddr;
+ int *installlist = &install_func_context.installlist;
/* Point to the location of the name of a configuration file in Stage 2. */
char *config_file_location;
/* If FILE is a Stage 1.5? */
@@ -1897,67 +2010,13 @@
int is_open = 0;
/* If LBA is forced? */
int is_force_lba = 0;
- /* Was the last sector full? */
- int last_length = SECTOR_SIZE;
-
+
+ *stage2_first_buffer = old_sect + SECTOR_SIZE;
#ifdef GRUB_UTIL
/* If the Stage 2 is in a partition mounted by an OS, this will store
the filename under the OS. */
char *stage2_os_file = 0;
#endif /* GRUB_UTIL */
-
- auto void disk_read_savesect_func (int sector, int offset, int length);
- auto void disk_read_blocklist_func (int sector, int offset, int length);
-
- /* Save the first sector of Stage2 in STAGE2_SECT. */
- auto void disk_read_savesect_func (int sector, int offset, int length)
- {
- if (debug)
- printf ("[%d]", sector);
-
- /* ReiserFS has files which sometimes contain data not aligned
- on sector boundaries. Returning an error is better than
- silently failing. */
- if (offset != 0 || length != SECTOR_SIZE)
- errnum = ERR_UNALIGNED;
-
- saved_sector = sector;
- }
-
- /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and
- INSTALLSECT. */
- auto void disk_read_blocklist_func (int sector, int offset, int length)
- {
- if (debug)
- printf("[%d]", sector);
-
- if (offset != 0 || last_length != SECTOR_SIZE)
- {
- /* We found a non-sector-aligned data block. */
- errnum = ERR_UNALIGNED;
- return;
- }
-
- last_length = length;
-
- if (*((unsigned long *) (installlist - 4))
- + *((unsigned short *) installlist) != sector
- || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4)
- {
- installlist -= 8;
-
- if (*((unsigned long *) (installlist - 8)))
- errnum = ERR_WONT_FIT;
- else
- {
- *((unsigned short *) (installlist + 2)) = (installaddr >> 4);
- *((unsigned long *) (installlist - 4)) = sector;
- }
- }
-
- *((unsigned short *) installlist) += 1;
- installaddr += 512;
- }
/* First, check the GNU-style long option. */
while (1)
@@ -1987,10 +2049,10 @@
addr = skip_to (0, file);
/* Get the installation address. */
- if (! safe_parse_maxint (&addr, &installaddr))
+ if (! safe_parse_maxint (&addr, installaddr))
{
/* ADDR is not specified. */
- installaddr = 0;
+ *installaddr = 0;
ptr = addr;
errnum = 0;
}
@@ -2084,17 +2146,17 @@
= (dest_drive & BIOS_FLAG_FIXED_DISK);
/* Read the first sector of Stage 2. */
- disk_read_hook = disk_read_savesect_func;
- if (grub_read (stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
+ disk_read_hook = install_savesect_helper;
+ if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
goto fail;
- stage2_first_sector = saved_sector;
+ stage2_first_sector = *saved_sector;
/* Read the second sector of Stage 2. */
if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE)
goto fail;
- stage2_second_sector = saved_sector;
+ stage2_second_sector = *saved_sector;
/* Check for the version of Stage 2. */
if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS))
@@ -2110,27 +2172,27 @@
/* If INSTALLADDR is not specified explicitly in the command-line,
determine it by the Stage 2 id. */
- if (! installaddr)
+ if (! *installaddr)
{
if (! is_stage1_5)
/* Stage 2. */
- installaddr = 0x8000;
+ *installaddr = 0x8000;
else
/* Stage 1.5. */
- installaddr = 0x2000;
+ *installaddr = 0x2000;
}
*((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR))
= stage2_first_sector;
*((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS))
- = installaddr;
+ = *installaddr;
*((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT))
- = installaddr >> 4;
+ = *installaddr >> 4;
- i = (int) stage2_first_buffer + SECTOR_SIZE - 4;
+ i = (int) *stage2_first_buffer + SECTOR_SIZE - 4;
while (*((unsigned long *) i))
{
- if (i < (int) stage2_first_buffer
+ if (i < (int) *stage2_first_buffer
|| (*((int *) (i - 4)) & 0x80000000)
|| *((unsigned short *) i) >= 0xA00
|| *((short *) (i + 2)) == 0)
@@ -2144,13 +2206,13 @@
i -= 8;
}
- installlist = (int) stage2_first_buffer + SECTOR_SIZE + 4;
- installaddr += SECTOR_SIZE;
+ *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4;
+ *installaddr += SECTOR_SIZE;
/* Read the whole of Stage2 except for the first sector. */
grub_seek (SECTOR_SIZE);
- disk_read_hook = disk_read_blocklist_func;
+ disk_read_hook = install_blocklist_helper;
if (! grub_read (dummy, -1))
goto fail;
@@ -2233,7 +2295,7 @@
/* Skip the first sector. */
grub_seek (SECTOR_SIZE);
- disk_read_hook = disk_read_savesect_func;
+ disk_read_hook = install_savesect_helper;
if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE)
goto fail;
@@ -2303,7 +2365,7 @@
else
#endif /* GRUB_UTIL */
{
- if (! devwrite (saved_sector - part_start, 1, stage2_buffer))
+ if (! devwrite (*saved_sector - part_start, 1, stage2_buffer))
goto fail;
}
}
@@ -2325,7 +2387,7 @@
goto fail;
}
- if (fwrite (stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
+ if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
{
fclose (fp);
errnum = ERR_WRITE;
@@ -2352,7 +2414,7 @@
goto fail;
if (! devwrite (stage2_first_sector - src_part_start, 1,
- stage2_first_buffer))
+ *stage2_first_buffer))
goto fail;
if (! devwrite (stage2_second_sector - src_part_start, 1,
--- grub-0.97/stage2/shared.h
+++ grub-0.97/stage2/shared.h
@@ -36,8 +36,8 @@
/* Maybe redirect memory requests through grub_scratch_mem. */
#ifdef GRUB_UTIL
-extern char *grub_scratch_mem;
-# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem)
+extern void *grub_scratch_mem;
+# define RAW_ADDR(x) ((x) + (unsigned long) grub_scratch_mem)
# define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4)
#else
# define RAW_ADDR(x) (x)

80
src/patches/grub-0.97/grub-0.97-configfile.patch Normal file
View File

@@ -0,0 +1,80 @@
diff -ru grub-0.97-old/docs/grub.8 grub-0.97/docs/grub.8
--- grub-0.97-old/docs/grub.8 2005-05-08 02:48:56.000000000 +0000
+++ grub-0.97/docs/grub.8 2006-08-05 13:17:07.868362408 +0000
@@ -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-old/docs/grub.texi grub-0.97/docs/grub.texi
--- grub-0.97-old/docs/grub.texi 2005-05-08 02:59:59.000000000 +0000
+++ grub-0.97/docs/grub.texi 2006-08-05 13:17:07.875361344 +0000
@@ -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
@@ -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
@@ -3542,7 +3542,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-old/grub/asmstub.c grub-0.97/grub/asmstub.c
--- grub-0.97-old/grub/asmstub.c 2005-02-16 20:45:14.000000000 +0000
+++ grub-0.97/grub/asmstub.c 2006-08-05 13:17:07.866362712 +0000
@@ -71,7 +71,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-old/stage2/asm.S grub-0.97/stage2/asm.S
--- grub-0.97-old/stage2/asm.S 2004-06-19 16:55:22.000000000 +0000
+++ grub-0.97/stage2/asm.S 2006-08-05 13:17:07.859363776 +0000
@@ -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-old/stage2/builtins.c grub-0.97/stage2/builtins.c
--- grub-0.97-old/stage2/builtins.c 2005-02-15 21:58:23.000000000 +0000
+++ grub-0.97/stage2/builtins.c 2006-08-05 13:17:07.864363016 +0000
@@ -3973,7 +3973,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. */

78
src/patches/grub-0.97/grub-0.97-dirs.patch Normal file
View File

@@ -0,0 +1,78 @@
diff -Nur grub-0.97-splash/docs/grub.texi grub-0.97-dirs/docs/grub.texi
--- grub-0.97-splash/docs/grub.texi 2005-08-21 20:29:22.000000000 +0300
+++ grub-0.97-dirs/docs/grub.texi 2005-08-21 20:31:12.000000000 +0300
@@ -479,13 +479,13 @@
if, by any chance, your hard drive becomes unusable (unbootable).
GRUB comes with boot images, which are normally put in the directory
-@file{/usr/lib/grub/i386-pc}. If you do not use grub-install, then
+@file{/usr/share/grub/i386-pc}. If you do not use grub-install, then
you need to copy the files @file{stage1}, @file{stage2}, and
@file{*stage1_5} to the directory @file{/boot/grub}, and run the
@command{grub-set-default} (@pxref{Invoking grub-set-default}) if you
intend to use @samp{default saved} (@pxref{default}) in your
configuration file. Hereafter, the directory where GRUB images are
-initially placed (normally @file{/usr/lib/grub/i386-pc}) will be
+initially placed (normally @file{/usr/share/grub/i386-pc}) will be
called the @dfn{image directory}, and the directory where the boot
loader needs to find them (usually @file{/boot/grub}) will be called
the @dfn{boot directory}.
@@ -513,7 +513,7 @@
@example
@group
-# @kbd{cd /usr/lib/grub/i386-pc}
+# @kbd{cd /usr/share/grub/i386-pc}
# @kbd{dd if=stage1 of=/dev/fd0 bs=512 count=1}
1+0 records in
1+0 records out
@@ -707,7 +707,7 @@
Copy the file @file{stage2_eltorito}:
@example
-$ @kbd{cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub}
+$ @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}
diff -Nur grub-0.97-splash/Makefile.am grub-0.97-dirs/Makefile.am
--- grub-0.97-splash/Makefile.am 2005-08-21 20:29:14.000000000 +0300
+++ grub-0.97-dirs/Makefile.am 2005-08-21 20:31:12.000000000 +0300
@@ -2,3 +2,4 @@
AUTOMAKE_OPTIONS = 1.7 gnu
SUBDIRS = netboot stage2 stage1 lib grub util docs
EXTRA_DIST = BUGS MAINTENANCE
+pkgdatadir=$(datadir)
diff -Nur grub-0.97-splash/stage1/Makefile.am grub-0.97-dirs/stage1/Makefile.am
--- grub-0.97-splash/stage1/Makefile.am 2005-08-21 20:29:14.000000000 +0300
+++ grub-0.97-dirs/stage1/Makefile.am 2005-08-21 20:31:12.000000000 +0300
@@ -1,4 +1,4 @@
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = /usr/share/grub/i386-pc
nodist_pkglib_DATA = stage1
CLEANFILES = $(nodist_pkglib_DATA)
diff -Nur grub-0.97-splash/stage2/Makefile.am grub-0.97-dirs/stage2/Makefile.am
--- grub-0.97-splash/stage2/Makefile.am 2005-08-21 20:29:14.000000000 +0300
+++ grub-0.97-dirs/stage2/Makefile.am 2005-08-21 20:31:12.000000000 +0300
@@ -27,7 +27,7 @@
-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
# Stage 2 and Stage 1.5's.
-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+pkglibdir = /usr/share/grub/i386-pc
EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
diff -Nur grub-0.97-splash/util/grub-install.in grub-0.97-dirs/util/grub-install.in
--- grub-0.97-splash/util/grub-install.in 2005-08-21 20:29:14.000000000 +0300
+++ grub-0.97-dirs/util/grub-install.in 2005-08-21 20:31:12.000000000 +0300
@@ -27,7 +27,7 @@
host_cpu=@host_cpu@
host_os=@host_os@
host_vendor=@host_vendor@
-pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
+pkglibdir=/usr/share/grub/i386-pc
grub_shell=${sbindir}/grub
grub_set_default=${sbindir}/grub-set-default

94
src/patches/grub-0.97/grub-0.97-misc.patch Normal file
View File

@@ -0,0 +1,94 @@
diff -Nur grub-0.97-ori/lib/device.c grub-0.97-misc/lib/device.c
--- grub-0.97-ori/lib/device.c 2005-03-28 02:14:25.000000000 +0300
+++ grub-0.97-misc/lib/device.c 2005-08-21 20:22:30.000000000 +0300
@@ -831,9 +831,11 @@
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);
}
diff -Nur grub-0.97-ori/stage2/boot.c grub-0.97-misc/stage2/boot.c
--- grub-0.97-ori/stage2/boot.c 2004-03-30 14:44:08.000000000 +0300
+++ grub-0.97-misc/stage2/boot.c 2005-08-21 20:22:30.000000000 +0300
@@ -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;
diff -Nur grub-0.97-ori/stage2/builtins.c grub-0.97-misc/stage2/builtins.c
--- grub-0.97-ori/stage2/builtins.c 2005-02-15 23:58:23.000000000 +0200
+++ grub-0.97-misc/stage2/builtins.c 2005-08-21 20:22:30.000000000 +0300
@@ -1842,9 +1842,23 @@
#ifdef GRUB_UTIL
else if (grub_memcmp ("--stage2=", arg, sizeof ("--stage2=") - 1) == 0)
{
+ int fd;
stage2_os_file = arg + sizeof ("--stage2=") - 1;
arg = skip_to (0, arg);
nul_terminate (stage2_os_file);
+
+#if defined(__linux__) && defined (FSYS_REISERFS)
+ if ((fd=open(stage2_os_file, O_RDONLY)) >= 0)
+ {
+ struct statfs buf;
+ /* see if the file sits on a reiserfs,
+ and try do defragment it if so. */
+ fstatfs(fd, &buf);
+ if (buf.f_type == REISERFS_SUPER_MAGIC)
+ ioctl (fd, REISERFS_IOC_UNPACK, 1);
+ }
+#endif /* __linux__ && FSYS_REISERFS */
+
}
#endif /* GRUB_UTIL */
else
diff -Nur grub-0.97-ori/stage2/filesys.h grub-0.97-misc/stage2/filesys.h
--- grub-0.97-ori/stage2/filesys.h 2004-05-14 22:36:43.000000000 +0300
+++ grub-0.97-misc/stage2/filesys.h 2005-08-21 20:22:30.000000000 +0300
@@ -73,6 +73,16 @@
int reiserfs_read (char *buf, int len);
int reiserfs_dir (char *dirname);
int reiserfs_embed (int *start_sector, int needed_sectors);
+#if defined(__linux__) && defined (GRUB_UTIL)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/statfs.h>
+#include <fcntl.h>
+/* from <linux/reiserfs_fs.h> */
+#define REISERFS_SUPER_MAGIC 0x52654973
+#define REISERFS_IOC_UNPACK _IOW(0xCD,1,long)
+#endif
#else
#define FSYS_REISERFS_NUM 0
#endif
diff -Nur grub-0.97-ori/util/mbchk.c grub-0.97-misc/util/mbchk.c
--- grub-0.97-ori/util/mbchk.c 2003-10-19 18:36:45.000000000 +0300
+++ grub-0.97-misc/util/mbchk.c 2005-08-21 20:22:30.000000000 +0300
@@ -59,7 +59,9 @@
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;

943
src/patches/grub-0.97/grub-0.97-splash.patch Normal file
View File

@@ -0,0 +1,943 @@
diff -Nur grub-0.97-misc/docs/grub.texi grub-0.97-splash/docs/grub.texi
--- grub-0.97-misc/docs/grub.texi 2005-08-21 20:22:18.000000000 +0300
+++ grub-0.97-splash/docs/grub.texi 2005-08-21 20:29:22.000000000 +0300
@@ -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
diff -Nur grub-0.97-misc/grub/asmstub.c grub-0.97-splash/grub/asmstub.c
--- grub-0.97-misc/grub/asmstub.c 2005-08-21 20:22:18.000000000 +0300
+++ grub-0.97-splash/grub/asmstub.c 2005-08-21 20:29:22.000000000 +0300
@@ -480,6 +480,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)
diff -Nur grub-0.97-misc/stage2/asm.S grub-0.97-splash/stage2/asm.S
--- grub-0.97-misc/stage2/asm.S 2005-08-21 20:22:18.000000000 +0300
+++ grub-0.97-splash/stage2/asm.S 2005-08-21 20:29:22.000000000 +0300
@@ -1610,6 +1610,301 @@
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
+ andl $0xf,%edi
+ shrl $4,%edx
+
+ pushl %ebp
+
+ call EXT_C(prot_to_real)
+ .code16
+
+ pushw %ds
+
+ movw %dx,%ds
+ leal gfx_ofs_sys_cfg(%di),%esi
+ movl gfx_ofs_mem_file(%di),%eax
+ movl gfx_ofs_mem_cur(%di),%ebx
+ movl gfx_ofs_mem_max(%di),%ecx
+ movw %ds,%dx
+
+ /* basically just a lcall, but we need %edi */
+ pushw %cs
+ pushw $gfx_init_50
+ pushl gfx_ofs_jmp_table + 4 * 0 (%di)
+
+ movl gfx_ofs_mem_align(%di),%edi
+
+ lret
+
+gfx_init_50:
+ movl $0,%ebx
+ adcl $0,%ebx
+
+ popw %ds
+
+ DATA32 call EXT_C(real_to_prot)
+ .code32
+
+ popl %ebp
+
+ movl %ebx,%eax
+ negl %ebx
+ incl %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
+ andl $0xf,%ebx
+ shrl $4,%edx
+
+ pushl %ebp
+
+ call EXT_C(prot_to_real)
+ .code16
+
+ pushw %ds
+
+ movw %dx,%ds
+ shll $4,%edx
+ movl gfx_ofs_cmdline(%bx),%edi
+ subl %edx,%edi
+ movw gfx_ofs_cmdline_len(%bx),%cx
+ movw gfx_ofs_timeout(%bx),%ax
+ imulw $18,%ax
+
+ pushl %ebp
+ lcall *gfx_ofs_jmp_table + 4 * 2 (%bx)
+ popl %ebp
+ 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 %sp,%bp
+
+ 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)
+
+ movw %bp,%si
+ pushw %ss
+ popw %es
+
+ 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)
diff -Nur grub-0.97-misc/stage2/builtins.c grub-0.97-splash/stage2/builtins.c
--- grub-0.97-misc/stage2/builtins.c 2005-08-21 20:22:30.000000000 +0300
+++ grub-0.97-splash/stage2/builtins.c 2005-08-21 20:29:22.000000000 +0300
@@ -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. */
@@ -1331,6 +1333,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)
@@ -4837,6 +4859,7 @@
&builtin_find,
&builtin_fstest,
&builtin_geometry,
+ &builtin_gfxmenu,
&builtin_halt,
&builtin_help,
&builtin_hiddenmenu,
diff -Nur grub-0.97-misc/stage2/shared.h grub-0.97-splash/stage2/shared.h
--- grub-0.97-misc/stage2/shared.h 2005-08-21 20:22:18.000000000 +0300
+++ grub-0.97-splash/stage2/shared.h 2005-08-21 20:29:22.000000000 +0300
@@ -374,6 +374,27 @@
#endif /* WITHOUT_LIBC_STUBS */
+/* see typedef gfx_data_t below */
+#define gfx_ofs_ok 0x00
+#define gfx_ofs_mem_start 0x04
+#define gfx_ofs_mem_cur 0x08
+#define gfx_ofs_mem_max 0x0c
+#define gfx_ofs_code_seg 0x10
+#define gfx_ofs_jmp_table 0x14
+#define gfx_ofs_sys_cfg 0x44
+#define gfx_ofs_cmdline 0x64
+#define gfx_ofs_cmdline_len 0x68
+#define gfx_ofs_menu_list 0x6c
+#define gfx_ofs_menu_default_entry 0x70
+#define gfx_ofs_menu_entries 0x74
+#define gfx_ofs_menu_entry_len 0x78
+#define gfx_ofs_args_list 0x7c
+#define gfx_ofs_args_entry_len 0x80
+#define gfx_ofs_timeout 0x84
+#define gfx_ofs_mem_file 0x88
+#define gfx_ofs_mem_align 0x8c
+
+
#ifndef ASM_FILE
/*
* Below this should be ONLY defines and other constructs for C code.
@@ -595,6 +616,41 @@
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 mem_start, mem_cur, mem_max;
+ unsigned code_seg; /* code segment of binary graphics code */
+ unsigned jmp_table[12]; /* link to graphics functions */
+ unsigned char sys_cfg[32]; /* 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) */
+ unsigned mem_file; /* aligned gfx file start */
+ unsigned mem_align; /* aligned cpio file start */
+} __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
{
diff -Nur grub-0.97-misc/stage2/stage2.c grub-0.97-splash/stage2/stage2.c
--- grub-0.97-misc/stage2/stage2.c 2005-08-21 20:22:18.000000000 +0300
+++ grub-0.97-splash/stage2/stage2.c 2005-08-21 20:29:22.000000000 +0300
@@ -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,413 @@
}
+
+#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
+
+/*
+ * Go through config entry and find kernel args, if any.
+ */
+static char *get_kernel_args(char *cfg)
+{
+ int j;
+ char *s, *t = "";
+
+ for(j = 0; ; j++) {
+ s = get_entry(cfg, j, 0);
+ if(!*s) break;
+ if(!memcmp(s, "kernel", 6) && (s[6] == ' ' || s[6] == '\t')) {
+ t = skip_to(0, s);
+ if(*t) t = skip_to(0, t);
+ break;
+ }
+ }
+
+ return t;
+}
+
+
+/*
+ * Check header and return code start offset.
+ */
+static unsigned magic_ok(unsigned char *buf)
+{
+ if(
+ *(unsigned *) buf == 0x0b2d97f00 && /* magic id */
+ (buf[4] == 5 || buf[4] == 6) /* version 5 or 6 */
+ ) {
+ 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 i, fname_len, flen, 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);
+ flen = *(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 += flen;
+ i = ((i + 1) & ~1);
+ }
+ else {
+ break;
+ }
+ }
+
+ return code_start;
+}
+
+
+/*
+ * Leave that much space on the heap. Everything else goes to the graphics
+ * functions.
+ *
+ * 0x2000 is _not_ enough
+ */
+#define MIN_HEAP_SIZE 0x4000
+
+/* gfx code needs at least this much free memory */
+#define MIN_GFX_FREE 0xc000
+
+/*
+ * 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;
+ unsigned u, buf_size, code_start, file_start;
+ char *s, *t, *cfg, *new_config;
+ char *saved_heap;
+ int i, j, max_len;
+ int selected_entry;
+ gfx_data_t *gfx_data;
+
+ /*
+ * 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(mem_start);
+ gfx_ofs_check(mem_cur);
+ gfx_ofs_check(mem_max);
+ 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);
+ gfx_ofs_check(mem_file);
+ gfx_ofs_check(mem_align);
+ #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[0] = 2; /* bootloader: grub */
+ 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);
+
+
+ /* 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));
+ 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)));
+ }
+
+
+ /* go back here when we no longer need the graphics data */
+ saved_heap = heap;
+
+
+ /* get memory area to be used by graphics functions */
+
+ buf = (unsigned char *) (((unsigned) heap + 0xf) & ~0xf);
+
+ buf_size = (unsigned char *) &buf - buf - MIN_HEAP_SIZE;
+ buf_size &= ~0xf;
+
+ /* too small */
+ if(buf_size < 0x10000) return;
+
+ gfx_data->mem_start = (unsigned) buf;
+ gfx_data->mem_max = gfx_data->mem_start + buf_size;
+
+#if 0
+ printf("graphics menu\n");
+ printf(
+ "heap = 0x%x, buf = 0x%x (0x%x bytes), graphics_file = %s\n",
+ heap, gfx_data->mem_start, buf_size, graphics_file
+ );
+ getkey();
+#endif
+
+ heap += buf_size;
+
+
+ /* read the file */
+
+ if(!grub_open(graphics_file)) {
+ printf("graphics file \"%s\" missing, press a key to continue...\n", graphics_file);
+ getkey();
+ return;
+ }
+
+ i = grub_read(buf, buf_size);
+
+ grub_close();
+
+ if(i <= 0) {
+ printf("error reading \"%s\", press a key to continue...\n", graphics_file);
+ getkey();
+ return;
+ }
+
+ /* besides the file, we need some working memory, too */
+ if(i + MIN_GFX_FREE + 0x0f >= (int) buf_size) {
+ printf("file \"%s\" too large, press a key to continue...\n", graphics_file);
+ getkey();
+ return;
+ }
+
+ gfx_data->mem_cur = gfx_data->mem_start + ((i + 0x0f + 3) & ~3); /* align it */
+
+#if 0
+ printf("image: %d bytes (%d bytes left)\n", i, gfx_data->mem_max - gfx_data->mem_cur);
+ getkey();
+#endif
+
+
+ /* locate file inside cpio archive */
+ if(!(code_start = find_file(buf, i, &file_start))) {
+ printf("\"%s\" has wrong format, press a key to continue...\n", graphics_file);
+ getkey();
+ return;
+ }
+
+
+ /* align it */
+ u = (-(code_start + gfx_data->mem_start + file_start)) & 0x0f;
+ gfx_data->mem_align = gfx_data->mem_start + u;
+ gfx_data->mem_file = gfx_data->mem_align + file_start;
+ if(u) {
+ memcpy((void *) gfx_data->mem_align, (void *) gfx_data->mem_start, i);
+ }
+
+ /* init interface to graphics functions */
+
+ code_start += gfx_data->mem_file;
+
+#if 0
+ printf("code_start: 0x%x, file_start: 0x%x, mem_align = 0x%x, mem_file = 0x%x\n",
+ code_start, file_start, gfx_data->mem_align, gfx_data->mem_file
+ );
+ getkey();
+#endif
+
+ gfx_data->code_seg = code_start >> 4;
+
+#if 0
+ printf("code start = 0x%x, code_seg = 0x%x\n", code_start, gfx_data->code_seg);
+#endif
+
+ 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 *) code_start)[i];
+ }
+
+#if 0
+ 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("def: >%s<\n", gfx_data->menu_default_entry);
+#endif
+
+
+ /* switch to graphics mode */
+
+ if(gfx_init(gfx_data)) {
+#if 0
+ printf("gfx_init failed\n");
+ getkey();
+#endif
+ 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;
+
+ 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(i = 0; ; i++) {
+ s = get_entry(cfg, i, 0);
+ if(!*s) {
+ if(!i) *heap++ = 0;
+ *heap++ = 0;
+ break;
+ }
+ if(!memcmp(s, "kernel", 6) && (s[6] == ' ' || s[6] == '\t')) {
+ t = skip_to(0, s);
+ if(*t) t = skip_to(0, t);
+ memmove(heap, s, t - s);
+ heap += t - s;
+ *heap++ = ' ';
+ strcpy(heap, gfx_data->cmdline);
+ heap += strlen(gfx_data->cmdline) + 1;
+ }
+ 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)
{
@@ -1059,9 +1474,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);
}
}
}

14
src/patches/grub-0.97/grub-0.97-symlinkmenulst.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -ur grub-0.97/util/grub-install.in grub-0.97-old/util/grub-install.in
--- grub-0.97/util/grub-install.in 2006-08-05 16:46:33.505226176 +0200
+++ grub-0.97-old/util/grub-install.in 2004-07-24 20:57:31.000000000 +0200
@@ -447,6 +447,10 @@
rm -f $img_file
rm -f $log_file
+if ! test -e ${grubdir}/grub.conf ; then
+ test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
+fi
+
# Create a safe temporary file.
test -n "$mklog" && log_file=`$mklog`

1188
src/patches/grub-0.97/grub-0.97-wildcards.patch Normal file
View File

File diff suppressed because it is too large Load Diff

20
src/rc.d/rc.halt
View File

@@ -15,48 +15,48 @@ progressbar()
fi
}
# Set bootsplash
progressbar 9
progressbar 0
if [ -e /proc/splash ]; then
echo "silent" > /proc/splash
fi
echo "Stopping the RED interface..."
progressbar 8
progressbar 1
/etc/rc.d/rc.red stop 2>/dev/null
/etc/rc.d/rc.red clear 2>/dev/null
echo "Shutting down..."
progressbar 7
progressbar 2
sleep 3
echo "Saving the clock"
progressbar 6
progressbar 3
/sbin/hwclock --systohc
echo "Sending all processes the TERM signal..."
progressbar 5
progressbar 4
/sbin/killall5 -15
sleep 3
echo "Sending all processes the KILL signal..."
progressbar 4
progressbar 5
/sbin/killall5 -9
sleep 3
echo "Turning off swap"
progressbar 3
progressbar 6
swapoff -a
echo "Unmounting others"
progressbar 2
progressbar 7
umount -n -a
echo "Unmounting root"
progressbar 1
progressbar 8
mount -n -o remount,ro /
# Send nice shutdown beep now
progressbar 0
progressbar 9
/usr/bin/beep -l 75 -f 3000
/usr/bin/beep -l 75 -f 2000
/usr/bin/beep -l 75 -f 1000