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

add an additional minix partition type.

Browse source
This commit is contained in:
okuji 2000-09-10 16:45:15 +00:00
parent b5381c0919
commit bda2eea18d
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2000-09-11 OKUJI Yoshinori <okuji@gnu.org>
Reported by Alessandro Rubini:
* stage2/fsys_minix.c (minix_mount): Check if CURRENT_SLICE is a
partition type for minix fs, using the macro
IS_PC_SLICE_TYPE_MINIX.
* stage2/pc_slice.h (PC_SLICE_TYPE_LINUX_MINIX): New macro.
(IS_PC_SLICE_TYPE_MINIX): Likewise.
2000-09-09 Alessandro Rubini <rubini@morgana.systemy.it> 2000-09-09 Alessandro Rubini <rubini@morgana.systemy.it>
* stage1/stage1.S (notification_string): Print "GRUB " instead * stage1/stage1.S (notification_string): Print "GRUB " instead

4
stage2/fsys_minix.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 1999 Free Software Foundation, Inc. * Copyright (C) 1999, 2000 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -161,7 +161,7 @@ int
minix_mount (void) minix_mount (void)
{ {
if (((current_drive & 0x80 || current_slice != 0)) if (((current_drive & 0x80 || current_slice != 0))
&& (current_slice != PC_SLICE_TYPE_MINIX) && IS_PC_SLICE_TYPE_MINIX (current_slice)
&& ! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_OTHER)) && ! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_OTHER))
return 0; /* The partition is not of MINIX type */ return 0; /* The partition is not of MINIX type */

5
stage2/pc_slice.h
View file

@ -110,6 +110,7 @@
#define PC_SLICE_TYPE_FAT16_LBA 0xe #define PC_SLICE_TYPE_FAT16_LBA 0xe
#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_LINUX_MINIX 0x81
#define PC_SLICE_TYPE_EXT2FS 0x83 #define PC_SLICE_TYPE_EXT2FS 0x83
#define PC_SLICE_TYPE_LINUX_EXTENDED 0x85 #define PC_SLICE_TYPE_LINUX_EXTENDED 0x85
@ -130,6 +131,10 @@
|| ((type) == PC_SLICE_TYPE_WIN95_EXTENDED) \ || ((type) == PC_SLICE_TYPE_WIN95_EXTENDED) \
|| ((type) == PC_SLICE_TYPE_LINUX_EXTENDED)) || ((type) == PC_SLICE_TYPE_LINUX_EXTENDED))
#define IS_PC_SLICE_TYPE_MINIX(type) \
(((type) == PC_SLICE_TYPE_MINIX) \
|| ((type) == PC_SLICE_TYPE_LINUX_MINIX))
/* 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. */
#define PC_SLICE_TYPE_FREEBSD 0xa5 #define PC_SLICE_TYPE_FREEBSD 0xa5