diff --git a/ChangeLog b/ChangeLog index bdac30fd9..8a071a9f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,22 @@ +1999-10-03 Gordon Matzigkeit + + * 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 * stage2/builtins.c (boot_func): Pass MBI.CMDLINE instead of ARG to bsd_boot. - + 1999-10-03 OKUJI Yoshinori * stage2/gunzip.c (gunzip_test_header): Check if CURRENT_DRIVE is 0x20 instead of if the fs type is TFTP, because GRUB does not mount CURRENT_DRIVE when using a block file. Reported by Pavel Roskin. - + 1999-10-02 OKUJI Yoshinori * stage2/builtins.c (cat_func): Do not read the whole of a file @@ -19,31 +26,31 @@ bindings. (Commands): Added descriptions about "geometry", "device" and "cat". - + 1999-10-02 OKUJI Yoshinori Now it is possible to build the grub shell with old BSD curses. - + * stage2/shared.h [!A_NORMAL] (A_NORMAL): Set to zero. [!A_REVERSE && A_STANDOUT] (A_REVERSE): Set to A_STANDOUT. [!A_REVERSE && !A_STANDOUT] (A_REVERSE): Set to zero. - + 1999-09-30 Pavel Roskin * stage2/disk_io.c (set_bootdev): Mask 0x7F instead of 0x79 of the device number. - + 1999-10-01 OKUJI Yoshinori * configure.in (--without-curses): New option. If WITH_CURSES is no, do not check for curses. - + * stage2/disk_io.c (set_device) [STAGE1_5]: Change the type of DEV to unsigned long. * stage2/builtins.c (install_func): Always check for the Stage 2 id in FILE. Reported by Pavel Roskin. - + 1999-09-30 Gordon Matzigkeit * debian/postinst: New file to call install-info. diff --git a/debian/Makefile.am b/debian/Makefile.am index d53d29d55..83a4ed0c6 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -1 +1 @@ -EXTRA_DIST = README.debian changelog control copyright rules +EXTRA_DIST = README.debian changelog control copyright postinst prerm rules diff --git a/debian/Makefile.in b/debian/Makefile.in index 20d2f6d5d..3d70e0db1 100644 --- a/debian/Makefile.in +++ b/debian/Makefile.in @@ -83,7 +83,7 @@ host_vendor = @host_vendor@ install_sh = @install_sh@ -EXTRA_DIST = README.debian changelog control copyright rules +EXTRA_DIST = README.debian changelog control copyright postinst prerm rules subdir = debian mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/debian/README.debian b/debian/README.debian index 6162698b4..77025254e 100644 --- a/debian/README.debian +++ b/debian/README.debian @@ -15,9 +15,9 @@ edit configuration files or rerun a special installation program. 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 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 will break the next time you upgrade. diff --git a/debian/changelog b/debian/changelog index 9b2515bed..8fc0b9be8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ grub (0.5.93) unstable; urgency=low * 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) + * Update file locations in README.Debian. (fixes:bug#42834) grub (0.5.92) unstable; urgency=low @@ -81,5 +82,5 @@ grub (0.4-1) unstable; urgency=low Local variables: mode: debian-changelog -add-log-mailing-address: "bug-grub@gnu.org" +add-log-mailing-address: "gord@debian.org" End: diff --git a/stage2/builtins.c b/stage2/builtins.c index 36f63eb74..eb41251d8 100644 --- a/stage2/builtins.c +++ b/stage2/builtins.c @@ -132,7 +132,7 @@ static int cat_func (char *arg, int flags) { char c; - + if (! grub_open (arg)) return 1; @@ -469,7 +469,7 @@ geometry_func (char *arg, int flags) #ifdef GRUB_UTIL char *ptr; #endif - + set_device (device); if (errnum) return 1; @@ -511,7 +511,7 @@ geometry_func (char *arg, int flags) buf_drive = -1; } #endif /* GRUB_UTIL */ - + #ifdef GRUB_UTIL msg = device_map[current_drive]; #else @@ -520,14 +520,14 @@ geometry_func (char *arg, int flags) else msg = "CHS"; #endif - + grub_printf ("drive 0x%x: C/H/S = %d/%d/%d, " "The number of sectors = %d, %s\n", current_drive, geom.cylinders, geom.heads, geom.sectors, geom.total_sectors, msg); real_open_partition (1); - + return 0; } @@ -757,7 +757,7 @@ install_func (char *arg, int flags) char *config_file_location; /* If FILE is a Stage 1.5? */ int is_stage1_5 = 0; - + /* Save the first sector of Stage2 in STAGE2_SECT. */ static void disk_read_savesect_func (int sector) { @@ -766,7 +766,7 @@ install_func (char *arg, int flags) stage2_sect = sector; } - + /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and INSTALLSECT. */ static void disk_read_blocklist_func (int sector) @@ -948,9 +948,9 @@ install_func (char *arg, int flags) /* Check for the Stage 2 id. */ if (*((unsigned char *) (SCRATCHADDR + STAGE2_STAGE2_ID)) - == STAGE2_ID_STAGE2) + != STAGE2_ID_STAGE2) is_stage1_5 = 1; - + /* If INSTALLADDR is not specified explicitly in the command-line, determine it by the Stage 2 id. */ if (! installaddr) @@ -962,10 +962,10 @@ install_func (char *arg, int flags) /* Stage 1.5. */ installaddr = 0x2000; } - + *((unsigned short *) (BOOTSEC_LOCATION + STAGE1_INSTALLADDR)) = installaddr; - + /* Read the whole of Stage 2. */ filepos = 0; disk_read_hook = disk_read_blocklist_func; @@ -979,7 +979,7 @@ install_func (char *arg, int flags) config_file_location = ((char *) (SCRATCHADDR + STAGE2_VER_STR_OFFS)); while (*(config_file_location++)) ; - + if (*ptr == 'p') { write_stage2_sect = 1; @@ -988,17 +988,17 @@ install_func (char *arg, int flags) { /* Reset the device information in FILE if it is a Stage 1.5. */ int device = 0xFFFFFFFF; - + grub_memmove (config_file_location, (char *) &device, sizeof (int)); } - + ptr = skip_to (0, ptr); } if (*ptr) { write_stage2_sect = 1; - + if (! is_stage1_5) /* If it is a Stage 2, just copy PTR to CONFIG_FILE_LOCATION. */ grub_strcpy (config_file_location, ptr); @@ -1007,7 +1007,7 @@ install_func (char *arg, int flags) char *config_file; int device; int tmp = current_drive; - + /* Translate the external device syntax to the internal device syntax. */ if (! (config_file = set_device (ptr))) @@ -1016,7 +1016,7 @@ install_func (char *arg, int flags) current_drive = 0xFF; config_file = ptr; } - + device = current_drive << 24 | current_partition; current_drive = tmp; grub_memmove (config_file_location, (char *) &device, sizeof (int)); @@ -1036,7 +1036,7 @@ install_func (char *arg, int flags) disk_read_hook = 0; return 1; } - + if (biosdisk (BIOSDISK_WRITE, dest_drive, &dest_geom, dest_sector, 1, (BOOTSEC_LOCATION >> 4))) {