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

Packaging fixes and Pavel's simple stage 1.5 patch.

Browse source
This commit is contained in:
gord 1999-10-04 02:10:18 +00:00
parent 5a0b14429c
commit 1e67cbf7d0
6 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
1999-10-03 Gordon Matzigkeit <gord@fig.org>
* stage2/builtins.c (install_func): Fix check for the Stage 2 id.
From Pavel Roskin.
* debian/Makefile.am (EXTRA_DIST): Add postinst and prerm.
1999-10-03 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-10-03 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* stage2/builtins.c (boot_func): Pass MBI.CMDLINE instead of ARG * stage2/builtins.c (boot_func): Pass MBI.CMDLINE instead of ARG

2
debian/Makefile.am vendored
View file

@ -1 +1 @@
EXTRA_DIST = README.debian changelog control copyright rules EXTRA_DIST = README.debian changelog control copyright postinst prerm rules

2
debian/Makefile.in vendored
View file

@ -83,7 +83,7 @@ host_vendor = @host_vendor@
install_sh = @install_sh@ install_sh = @install_sh@
EXTRA_DIST = README.debian changelog control copyright rules EXTRA_DIST = README.debian changelog control copyright postinst prerm rules
subdir = debian subdir = debian
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h CONFIG_HEADER = ../config.h

4
debian/README.debian vendored
View file

@ -15,9 +15,9 @@ 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, do `info grub', and copy the binary files in then, do `info grub', and copy the binary files in
/usr/lib/grub/$(HWARCH) to /boot/grub. /usr/share/grub/$(HWARCH) to /boot/grub.
WARNING: Never use the binary files in /usr/lib/grub directly WARNING: Never use the binary files in /usr/share/grub directly
(i.e. without first copying them to /boot/grub), or else your system (i.e. without first copying them to /boot/grub), or else your system
will break the next time you upgrade. will break the next time you upgrade.

3
debian/changelog vendored
View file

@ -4,6 +4,7 @@ grub (0.5.93) unstable; urgency=low
* Highlight color set correctly when editing. (fixes:bug#42549) * Highlight color set correctly when editing. (fixes:bug#42549)
* dpkg-shlibdeps called on /usr/sbin/grub. (fixes:bug#42704) * dpkg-shlibdeps called on /usr/sbin/grub. (fixes:bug#42704)
* Properly install Texinfo documentation. (fixes:bug#42705,bug#42919) * Properly install Texinfo documentation. (fixes:bug#42705,bug#42919)
* Update file locations in README.Debian. (fixes:bug#42834)
grub (0.5.92) unstable; urgency=low grub (0.5.92) unstable; urgency=low
@ -81,5 +82,5 @@ grub (0.4-1) unstable; urgency=low
Local variables: Local variables:
mode: debian-changelog mode: debian-changelog
add-log-mailing-address: "bug-grub@gnu.org" add-log-mailing-address: "gord@debian.org"
End: End:

2
stage2/builtins.c
View file

@ -948,7 +948,7 @@ install_func (char *arg, int flags)
/* Check for the Stage 2 id. */ /* Check for the Stage 2 id. */
if (*((unsigned char *) (SCRATCHADDR + STAGE2_STAGE2_ID)) if (*((unsigned char *) (SCRATCHADDR + STAGE2_STAGE2_ID))
== STAGE2_ID_STAGE2) != STAGE2_ID_STAGE2)
is_stage1_5 = 1; is_stage1_5 = 1;
/* If INSTALLADDR is not specified explicitly in the command-line, /* If INSTALLADDR is not specified explicitly in the command-line,