vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Getting ready for new release.

Browse source
This commit is contained in:
gord 1999-09-30 18:19:06 +00:00
parent 18637363ba
commit d66e649b3f
10 changed files with 64 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ChangeLog
View file

@ -1,3 +1,14 @@
1999-09-30 Gordon Matzigkeit <gord@fig.org>
* debian/postinst: New file to call install-info.
* debian/prerm: Likewise.
* debian/rules (binary-arch): Add postinst and prerm, compress the
info files, and call dpkg-shlibdeps.
* stage2/cmdline.c (skip_to): Restructure, and count tabs as
whitespace.
(find_command): Likewise.
1999-09-30 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-30 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* grub/getopt.c: Moved to ... * grub/getopt.c: Moved to ...
@ -12,7 +23,7 @@
* Makefile.am (SUBDIRS): Added lib. * Makefile.am (SUBDIRS): Added lib.
* configure.in: lib/Makefile is added into the arguments for * configure.in: lib/Makefile is added into the arguments for
AC_OUTPUT. AC_OUTPUT.
1999-09-30 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-30 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
From Pavel Roskin: From Pavel Roskin:
@ -39,7 +50,7 @@
(struct ocg): Likewise. (struct ocg): Likewise.
(cgbase): Use mach_daddr_t instead of daddr_t. (cgbase): Use mach_daddr_t instead of daddr_t.
(itod): Likewise. (itod): Likewise.
1999-09-30 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-30 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* acinclude.m4 (grub_CHECK_START_SYMBOL): Use AC_TRY_LINK * acinclude.m4 (grub_CHECK_START_SYMBOL): Use AC_TRY_LINK
@ -50,7 +61,7 @@
* stage2/disk_io.c (set_device) [!STAGE1_5]: Use RESULT instead * stage2/disk_io.c (set_device) [!STAGE1_5]: Use RESULT instead
of RETVAL to check if the analysis succeeds. of RETVAL to check if the analysis succeeds.
1999-09-29 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-29 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* stage2/builtins.c (install_func): If the Stage 2 id in FILE is * stage2/builtins.c (install_func): If the Stage 2 id in FILE is
@ -74,7 +85,7 @@
* stage2/fsys_ffs.c (ffs_dir): Likewise. * stage2/fsys_ffs.c (ffs_dir): Likewise.
* stage2/fsys_fat.c (fat_dir): Likewise. * stage2/fsys_fat.c (fat_dir): Likewise.
* stage2/fsys_minix.c (minix_dir): Likewise. * stage2/fsys_minix.c (minix_dir): Likewise.
1999-09-29 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-29 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* stage1/stage1.S [!FFS_STAGE1_5] (blocklist_default_len): Do * stage1/stage1.S [!FFS_STAGE1_5] (blocklist_default_len): Do
@ -85,7 +96,7 @@
* stage2/builtins.c (install_func): When installing Stage 1.5, * stage2/builtins.c (install_func): When installing Stage 1.5,
if set_device returns NULL, then set CURRENT_DRIVE to 0xFF and if set_device returns NULL, then set CURRENT_DRIVE to 0xFF and
CONFIG_FILE to PTR. CONFIG_FILE to PTR.
1999-09-26 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-26 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* stage2/char_io.c [!STAGE1_5] (get_cmdline): In cl_insert, call * stage2/char_io.c [!STAGE1_5] (get_cmdline): In cl_insert, call
@ -102,7 +113,7 @@
(check_BSD_parts) [!STAGE1_5]: Likewise. (check_BSD_parts) [!STAGE1_5]: Likewise.
[!STAGE1_5] (print_a_completion): Ignore NAME if it is "." or [!STAGE1_5] (print_a_completion): Ignore NAME if it is "." or
"..". "..".
1999-09-25 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-25 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* acinclude.m4 (grub_CHECK_USCORE_END_SYMBOL): Do not call * acinclude.m4 (grub_CHECK_USCORE_END_SYMBOL): Do not call
@ -128,13 +139,13 @@
SAVED_PARTITION, respectively. Otherwise set to DRIVE and SAVED_PARTITION, respectively. Otherwise set to DRIVE and
PARTITION, respectively. PARTITION, respectively.
(setup_part) [STAGE1_5]: Always call set_device. (setup_part) [STAGE1_5]: Always call set_device.
1999-09-24 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-24 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* acinclude.m4 (grub_CHECK_END_SYMBOL): Add a missing * acinclude.m4 (grub_CHECK_END_SYMBOL): Add a missing
double-quote. Reported by Johannes Kroeger double-quote. Reported by Johannes Kroeger
<hanne@squirrel.owl.de>. <hanne@squirrel.owl.de>.
1999-09-14 Gordon Matzigkeit <gord@fig.org> 1999-09-14 Gordon Matzigkeit <gord@fig.org>
* stage1/stage1.S (blocklist_default_start): New label for default * stage1/stage1.S (blocklist_default_start): New label for default

2
debian/README.debian vendored
View file

@ -14,7 +14,7 @@ edit configuration files or rerun a special installation program.
NOTE: GRUB does not yet have a simple installation mechanism, but NOTE: GRUB does not yet have a simple installation mechanism, but
we're working on this, so please don't report it as a bug. Until we're working on this, so please don't report it as a bug. Until
then, read the Texinfo documentation, and copy the binary files in then, do `info grub', and copy the binary files in
/usr/lib/grub/$(HWARCH) to /boot/grub. /usr/lib/grub/$(HWARCH) to /boot/grub.
WARNING: Never use the binary files in /usr/lib/grub directly WARNING: Never use the binary files in /usr/lib/grub directly

5
debian/changelog vendored
View file

@ -1,5 +1,10 @@
grub (0.5.93) unstable; urgency=low grub (0.5.93) unstable; urgency=low
* Updated example configurations. (fixes:bug#42136)
* Highlight color set correctly when editing. (fixes:bug#42549)
* dpkg-shlibdeps called on /usr/sbin/grub. (fixes:bug#42704)
* Properly install Texinfo documentation. (fixes:bug#42705,bug#42919)
grub (0.5.92) unstable; urgency=low grub (0.5.92) unstable; urgency=low
* Data files are now in /usr/lib/grub/$(HWARCH). * Data files are now in /usr/lib/grub/$(HWARCH).

2
debian/control vendored
View file

@ -1,7 +1,7 @@
Source: grub Source: grub
Section: base Section: base
Priority: extra Priority: extra
Maintainer: Gordon Matzigkeit <gord@debian.org> Maintainer: GNU GRUB Maintainers <bug-grub@gnu.org>
Standards-Version: 2.5.0.0 Standards-Version: 2.5.0.0
Package: grub Package: grub

2
debian/copyright vendored
View file

@ -24,4 +24,4 @@ GRUB's copyright:
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
On Debian GNU systems, the complete text of the GNU General Public On Debian GNU systems, the complete text of the GNU General Public
License can be found in `/usr/doc/copyright/GPL'. License can be found in `/usr/share/common-licenses/GPL'.

6
debian/postinst vendored Normal file
View file

@ -0,0 +1,6 @@
#! /bin/sh
set -e
install-info --quiet --section Kernel Kernel \
/usr/info/grub.info.gz
install-info --quiet --section Kernel Kernel \
/usr/info/multiboot.info.gz

3
debian/prerm vendored Normal file
View file

@ -0,0 +1,3 @@
#! /bin/sh
install-info --quiet --remove /usr/info/grub.info.gz
install-info --quiet --remove /usr/info/multiboot.info.gz

4
debian/rules vendored
View file

@ -35,6 +35,7 @@ binary-arch: checkroot build
## install files ## install files
dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir
gzip -f9 debian/tmp/usr/info/*
$(INSTALL_DATA) TODO debian/tmp/usr/doc/grub/ $(INSTALL_DATA) TODO debian/tmp/usr/doc/grub/
$(INSTALL_DATA) BUGS debian/tmp/usr/doc/grub/ $(INSTALL_DATA) BUGS debian/tmp/usr/doc/grub/
@ -47,6 +48,9 @@ binary-arch: checkroot build
$(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/grub/ $(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/grub/
$(INSTALL_DATA) debian/README.debian debian/tmp/usr/doc/grub/ $(INSTALL_DATA) debian/README.debian debian/tmp/usr/doc/grub/
# Install control files.
$(INSTALL_PROGRAM) debian/postinst debian/prerm debian/tmp/DEBIAN
dpkg-shlibdeps debian/tmp/usr/sbin/grub
dpkg-gencontrol dpkg-gencontrol
chown -R root.root debian/tmp chown -R root.root debian/tmp
chmod -R go=rX debian/tmp chmod -R go=rX debian/tmp

8
docs/menu.lst
View file

@ -8,11 +8,11 @@ timeout 30
# By default, boot the first entry. # By default, boot the first entry.
default 0 default 0
# For booting the GNU HURD # For booting the GNU Hurd
title GNU/HURD title GNU/Hurd
root (hd0,0) root (hd0,0)
kernel /boot/gnumach root=hd0s1 kernel /boot/gnumach.gz root=hd0s1
module /boot/serverboot module /boot/serverboot.gz
# For booting Linux # For booting Linux
title GNU/Linux title GNU/Linux

45
stage2/cmdline.c
View file

@ -27,21 +27,16 @@
char * char *
skip_to (int after_equal, char *cmdline) skip_to (int after_equal, char *cmdline)
{ {
if (after_equal) /* Skip until we hit whitespace, or maybe an equal sign. */
{ while (*cmdline && *cmdline != ' ' && *cmdline != '\t' &&
while (*cmdline && *cmdline != ' ' && *cmdline != '=') ! (after_equal && *cmdline == '='))
cmdline++; cmdline ++;
while (*cmdline == ' ' || *cmdline == '=')
cmdline++; /* Skip whitespace, and maybe equal signs. */
} while (*cmdline == ' ' || *cmdline == '\t' ||
else (after_equal && *cmdline == '='))
{ cmdline ++;
while (*cmdline && *cmdline != ' ')
cmdline++;
while (*cmdline == ' ')
cmdline++;
}
return cmdline; return cmdline;
} }
@ -62,11 +57,11 @@ find_command (char *command)
char *ptr; char *ptr;
char c; char c;
struct builtin **builtin; struct builtin **builtin;
/* Find the first space and terminate the command name. */ /* Find the first space and terminate the command name. */
ptr = command; ptr = command;
while (*ptr && *ptr != ' ' && *ptr != '=') while (*ptr && *ptr != ' ' && *ptr != '\t' && *ptr != '=')
ptr++; ptr ++;
c = *ptr; c = *ptr;
*ptr = 0; *ptr = 0;
@ -74,7 +69,7 @@ find_command (char *command)
for (builtin = builtin_table; *builtin != 0; builtin++) for (builtin = builtin_table; *builtin != 0; builtin++)
{ {
int ret = grub_strcmp (command, (*builtin)->name); int ret = grub_strcmp (command, (*builtin)->name);
if (ret == 0) if (ret == 0)
{ {
/* Find the builtin for COMMAND. */ /* Find the builtin for COMMAND. */
@ -84,7 +79,7 @@ find_command (char *command)
else if (ret < 0) else if (ret < 0)
break; break;
} }
/* Cannot find COMMAND. */ /* Cannot find COMMAND. */
errnum = ERR_UNRECOGNIZED; errnum = ERR_UNRECOGNIZED;
*ptr = c; *ptr = c;
@ -100,7 +95,7 @@ init_cmdline (void)
saved_partition = install_partition; saved_partition = install_partition;
current_drive = 0xFF; current_drive = 0xFF;
errnum = 0; errnum = 0;
/* Restore memory probe state. */ /* Restore memory probe state. */
mbi.mem_upper = saved_mem_upper; mbi.mem_upper = saved_mem_upper;
if (mbi.mmap_length) if (mbi.mmap_length)
@ -124,7 +119,7 @@ enter_cmdline (char *heap)
{ {
struct builtin *builtin; struct builtin *builtin;
char *arg; char *arg;
*heap = 0; *heap = 0;
print_error (); print_error ();
@ -158,7 +153,7 @@ run_script (char *script, char *heap)
{ {
char *old_entry; char *old_entry;
char *cur_entry = script; char *cur_entry = script;
/* Initialize the data. */ /* Initialize the data. */
init_cmdline (); init_cmdline ();
@ -166,9 +161,9 @@ run_script (char *script, char *heap)
{ {
struct builtin *builtin; struct builtin *builtin;
char *arg; char *arg;
print_error (); print_error ();
if (errnum) if (errnum)
{ {
grub_printf ("Press any key to continue..."); grub_printf ("Press any key to continue...");