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

recognize the Linux extended partition and add a sanity check into grub-install.

Browse source
This commit is contained in:
okuji 2000-05-13 04:13:00 +00:00
parent 84f224a0d7
commit 81850d7016
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2000-05-13 OKUJI Yoshinori <okuji@gnu.org>
* util/grub-install.in: If the program `cp' fails, exit with the
status code 1. Suggested by Pavel Roskin.
2000-05-13 OKUJI Yoshinori <okuji@gnu.org>
From Pixel <pixel@mandrakesoft.com>:
* stage2/pc_slice.h (PC_SLICE_TYPE_LINUX_EXTENDED): New macro.
(IS_PC_SLICE_TYPE_EXTENDED): Added a check for
PC_SLICE_TYPE_LINUX_EXTENDED.
2000-05-05 OKUJI Yoshinori <okuji@gnu.org> 2000-05-05 OKUJI Yoshinori <okuji@gnu.org>
* stage2/common.c (init_bios_info) [!STAGE1_5]: When the memory * stage2/common.c (init_bios_info) [!STAGE1_5]: When the memory

4
stage2/pc_slice.h
View file

@ -111,6 +111,7 @@
#define PC_SLICE_TYPE_WIN95_EXTENDED 0xf #define PC_SLICE_TYPE_WIN95_EXTENDED 0xf
#define PC_SLICE_TYPE_MINIX 0x80 #define PC_SLICE_TYPE_MINIX 0x80
#define PC_SLICE_TYPE_EXT2FS 0x83 #define PC_SLICE_TYPE_EXT2FS 0x83
#define PC_SLICE_TYPE_LINUX_EXTENDED 0x85
/* For convinience. */ /* For convinience. */
/* Check if TYPE is a FAT partition type. Clear the hidden flag before /* Check if TYPE is a FAT partition type. Clear the hidden flag before
@ -126,7 +127,8 @@
#define IS_PC_SLICE_TYPE_EXTENDED(type) \ #define IS_PC_SLICE_TYPE_EXTENDED(type) \
(((type) == PC_SLICE_TYPE_EXTENDED) \ (((type) == PC_SLICE_TYPE_EXTENDED) \
|| ((type) == PC_SLICE_TYPE_WIN95_EXTENDED)) || ((type) == PC_SLICE_TYPE_WIN95_EXTENDED) \
|| ((type) == PC_SLICE_TYPE_LINUX_EXTENDED))
/* these ones are special, as they use their own partitioning scheme /* these ones are special, as they use their own partitioning scheme
to subdivide the PC partitions from there. */ to subdivide the PC partitions from there. */

3
util/grub-install.in
View file

@ -249,7 +249,8 @@ fi
# Copy the GRUB images to the GRUB directory. # Copy the GRUB images to the GRUB directory.
rm -f ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5 rm -f ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5
cp ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5 ${grubdir} cp ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5 \
${grubdir} || exit 1
# Create a safe temporary file. # Create a safe temporary file.
test -x /bin/tempfile && log_file=`tempfile --prefix=grub` test -x /bin/tempfile && log_file=`tempfile --prefix=grub`