include/xalloc.h \
include/xgetpass.h \
include/pt-sgi.h \
+ include/pt-mbr.h \
include/pt-sun.h
--- /dev/null
+#ifndef UTIL_LINUX_PT_MBR_H
+#define UTIL_LINUX_PT_MBR_H
+
+enum {
+ MBR_EMPTY_PARTITION = 0x00,
+ MBR_FAT12_PARTITION = 0x01,
+ MBR_XENIX_ROOT_PARTITION = 0x02,
+ MBR_XENIX_USR_PARTITION = 0x03,
+ MBR_FAT16_LESS32M_PARTITION = 0x04,
+ MBR_DOS_EXTENDED_PARTITION = 0x05,
+ MBR_FAT16_PARTITION = 0x06, /* DOS 16-bit >=32M */
+ MBR_HPFS_NTFS_PARTITION = 0x07, /* OS/2 IFS, eg, HPFS or NTFS or QNX */
+ MBR_AIX_PARTITION = 0x08, /* AIX boot (AIX -- PS/2 port) or SplitDrive */
+ MBR_AIX_BOOTABLE_PARTITION = 0x09, /* AIX data or Coherent */
+ MBR_OS2_BOOTMNGR_PARTITION = 0x0a, /* OS/2 Boot Manager */
+ MBR_W95_FAT32_PARTITION = 0x0b,
+ MBR_W95_FAT32_LBA_PARTITION = 0x0c, /* LBA really is `Extended Int 13h' */
+ MBR_W95_FAT16_LBA_PARTITION = 0x0e,
+ MBR_W95_EXTENDED_PARTITION = 0x0f,
+ MBR_OPUS_PARTITION = 0x10,
+ MBR_HIDDEN_FAT12_PARTITION = 0x11,
+ MBR_COMPAQ_DIAGNOSTICS_PARTITION = 0x12,
+ MBR_HIDDEN_FAT16_L32M_PARTITION = 0x14,
+ MBR_HIDDEN_FAT16_PARTITION = 0x16,
+ MBR_HIDDEN_HPFS_NTFS_PARTITION = 0x17,
+ MBR_AST_SMARTSLEEP_PARTITION = 0x18,
+ MBR_HIDDEN_W95_FAT32_PARTITION = 0x1b,
+ MBR_HIDDEN_W95_FAT32LBA_PARTITION = 0x1c,
+ MBR_HIDDEN_W95_FAT16LBA_PARTITION = 0x1e,
+ MBR_NEC_DOS_PARTITION = 0x24,
+ MBR_PLAN9_PARTITION = 0x39,
+ MBR_PARTITIONMAGIC_PARTITION = 0x3c,
+ MBR_VENIX80286_PARTITION = 0x40,
+ MBR_PPC_PREP_BOOT_PARTITION = 0x41,
+ MBR_SFS_PARTITION = 0x42,
+ MBR_QNX_4X_PARTITION = 0x4d,
+ MBR_QNX_4X_2ND_PARTITION = 0x4e,
+ MBR_QNX_4X_3RD_PARTITION = 0x4f,
+ MBR_DM_PARTITION = 0x50,
+ MBR_DM6_AUX1_PARTITION = 0x51, /* (or Novell) */
+ MBR_CPM_PARTITION = 0x52, /* CP/M or Microport SysV/AT */
+ MBR_DM6_AUX3_PARTITION = 0x53,
+ MBR_DM6_PARTITION = 0x54,
+ MBR_EZ_DRIVE_PARTITION = 0x55,
+ MBR_GOLDEN_BOW_PARTITION = 0x56,
+ MBR_PRIAM_EDISK_PARTITION = 0x5c,
+ MBR_SPEEDSTOR_PARTITION = 0x61,
+ MBR_GNU_HURD_PARTITION = 0x63, /* GNU HURD or Mach or Sys V/386 (such as ISC UNIX) */
+ MBR_UNIXWARE_PARTITION = MBR_GNU_HURD_PARTITION,
+ MBR_NETWARE_286_PARTITION = 0x64,
+ MBR_NETWARE_386_PARTITION = 0x65,
+ MBR_DISKSECURE_MULTIBOOT_PARTITION = 0x70,
+ MBR_PC_IX_PARTITION = 0x75,
+ MBR_OLD_MINIX_PARTITION = 0x80, /* Minix 1.4a and earlier */
+ MBR_MINIX_PARTITION = 0x81, /* Minix 1.4b and later */
+ MBR_LINUX_SWAP_PARTITION = 0x82,
+ MBR_SOLARIS_X86_PARTITION = MBR_LINUX_SWAP_PARTITION,
+ MBR_LINUX_DATA_PARTITION = 0x83,
+ MBR_OS2_HIDDEN_DRIVE_PARTITION = 0x84,
+ MBR_LINUX_EXTENDED_PARTITION = 0x85,
+ MBR_NTFS_VOL_SET1_PARTITION = 0x86,
+ MBR_NTFS_VOL_SET2_PARTITION = 0x87,
+ MBR_LINUX_PLAINTEXT_PARTITION = 0x88,
+ MBR_LINUX_LVM_PARTITION = 0x8e,
+ MBR_AMOEBA_PARTITION = 0x93,
+ MBR_AMOEBA_BBT_PARTITION = 0x94, /* (bad block table) */
+ MBR_BSD_OS_PARTITION = 0x9f, /* BSDI */
+ MBR_THINKPAD_HIBERNATION_PARTITION = 0xa0,
+ MBR_FREEBSD_PARTITION = 0xa5, /* various BSD flavours */
+ MBR_OPENBSD_PARTITION = 0xa6,
+ MBR_NEXTSTEP_PARTITION = 0xa7,
+ MBR_DARWIN_UFS_PARTITION = 0xa8,
+ MBR_NETBSD_PARTITION = 0xa9,
+ MBR_DARWIN_BOOT_PARTITION = 0xab,
+ MBR_HFS_HFS_PARTITION = 0xaf,
+ MBR_BSDI_FS_PARTITION = 0xb7,
+ MBR_BSDI_SWAP_PARTITION = 0xb8,
+ MBR_BOOTWIZARD_HIDDEN_PARTITION = 0xbb,
+ MBR_SOLARIS_BOOT_PARTITION = 0xbe,
+ MBR_SOLARIS_PARTITION = 0xbf,
+ MBR_DRDOS_FAT12_PARTITION = 0xc1,
+ MBR_DRDOS_FAT16_L32M_PARTITION = 0xc4,
+ MBR_DRDOS_FAT16_PARTITION = 0xc6,
+ MBR_SYRINX_PARTITION = 0xc7,
+ MBR_NONFS_DATA_PARTITION = 0xda,
+ MBR_CPM_CTOS_PARTITION = 0xdb, /* CP/M or Concurrent CP/M or Concurrent DOS or CTOS */
+ MBR_DELL_UTILITY_PARTITION = 0xde, /* Dell PowerEdge Server utilities */
+ MBR_BOOTIT_PARTITION = 0xdf, /* BootIt EMBRM */
+ MBR_DOS_ACCESS_PARTITION = 0xe1, /* DOS access or SpeedStor 12-bit FAT extended partition */
+ MBR_DOS_RO_PARTITION = 0xe3, /* DOS R/O or SpeedStor */
+ MBR_SPEEDSTOR_EXTENDED_PARTITION = 0xe4, /* SpeedStor 16-bit FAT extended partition < 1024 cyl. */
+ MBR_BEOS_FS_PARTITION = 0xeb,
+ MBR_GPT_PARTITION = 0xee, /* Intel EFI GUID Partition Table */
+ MBR_EFI_SYSTEM_PARTITION = 0xef, /* Intel EFI System Partition */
+ MBR_LINUX_PARISC_BOOT_PARTITION = 0xf0, /* Linux/PA-RISC boot loader */
+ MBR_SPEEDSTOR1_PARTITION = 0xf1,
+ MBR_SPEEDSTOR2_PARTITION = 0xf4, /* SpeedStor large partition */
+ MBR_DOS_SECONDARY_PARTITION = 0xf2, /* DOS 3.3+ secondary */
+ MBR_VMWARE_VMFS_PARTITION = 0xfb,
+ MBR_VMWARE_VMKCORE_PARTITION = 0xfc, /* VMware kernel dump partition */
+ MBR_LINUX_RAID_PARTITION = 0xfd, /* New (2.2.x) raid partition with autodetect using persistent superblock */
+ MBR_LANSTEP_PARTITION = 0xfe, /* SpeedStor >1024 cyl. or LANstep */
+ MBR_XENIX_BBT_PARTITION = 0xff, /* Xenix Bad Block Table */
+};
+
+#endif /* UTIL_LINUX_PT_MBR_H */
\
libblkid/src/partitions/aix.c \
libblkid/src/partitions/aix.h \
- libblkid/src/partitions/blkid_parttypes.h \
libblkid/src/partitions/bsd.c \
libblkid/src/partitions/dos.c \
libblkid/src/partitions/dos.h \
+++ /dev/null
-/*
- * Partition types
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/* Note, _L32M means <32M (less), for example FAT16_L32M */
-
-enum {
- BLKID_EMPTY_PARTITION = 0x00,
- BLKID_FAT12_PARTITION = 0x01,
- BLKID_XENIX_ROOT_PARTITION = 0x02,
- BLKID_XENIX_USR_PARTITION = 0x03,
- BLKID_FAT16_LESS32M_PARTITION = 0x04,
- BLKID_DOS_EXTENDED_PARTITION = 0x05,
- BLKID_FAT16_PARTITION = 0x06, /* DOS 16-bit >=32M */
- BLKID_HPFS_NTFS_PARTITION = 0x07, /* OS/2 IFS, eg, HPFS or NTFS or QNX */
- BLKID_AIX_PARTITION = 0x08, /* AIX boot (AIX -- PS/2 port) or SplitDrive */
- BLKID_AIX_BOOTABLE_PARTITION = 0x09, /* AIX data or Coherent */
- BLKID_OS2_BOOTMNGR_PARTITION = 0x0a, /* OS/2 Boot Manager */
- BLKID_W95_FAT32_PARTITION = 0x0b,
- BLKID_W95_FAT32_LBA_PARTITION = 0x0c, /* LBA really is `Extended Int 13h' */
- BLKID_W95_FAT16_LBA_PARTITION = 0x0e,
- BLKID_W95_EXTENDED_PARTITION = 0x0f,
- BLKID_OPUS_PARTITION = 0x10,
- BLKID_HIDDEN_FAT12_PARTITION = 0x11,
- BLKID_COMPAQ_DIAGNOSTICS_PARTITION = 0x12,
- BLKID_HIDDEN_FAT16_L32M_PARTITION = 0x14,
- BLKID_HIDDEN_FAT16_PARTITION = 0x16,
- BLKID_HIDDEN_HPFS_NTFS_PARTITION = 0x17,
- BLKID_AST_SMARTSLEEP_PARTITION = 0x18,
- BLKID_HIDDEN_W95_FAT32_PARTITION = 0x1b,
- BLKID_HIDDEN_W95_FAT32LBA_PARTITION = 0x1c,
- BLKID_HIDDEN_W95_FAT16LBA_PARTITION = 0x1e,
- BLKID_NEC_DOS_PARTITION = 0x24,
- BLKID_PLAN9_PARTITION = 0x39,
- BLKID_PARTITIONMAGIC_PARTITION = 0x3c,
- BLKID_VENIX80286_PARTITION = 0x40,
- BLKID_PPC_PREP_BOOT_PARTITION = 0x41,
- BLKID_SFS_PARTITION = 0x42,
- BLKID_QNX_4X_PARTITION = 0x4d,
- BLKID_QNX_4X_2ND_PARTITION = 0x4e,
- BLKID_QNX_4X_3RD_PARTITION = 0x4f,
- BLKID_DM_PARTITION = 0x50,
- BLKID_DM6_AUX1_PARTITION = 0x51, /* (or Novell) */
- BLKID_CPM_PARTITION = 0x52, /* CP/M or Microport SysV/AT */
- BLKID_DM6_AUX3_PARTITION = 0x53,
- BLKID_DM6_PARTITION = 0x54,
- BLKID_EZ_DRIVE_PARTITION = 0x55,
- BLKID_GOLDEN_BOW_PARTITION = 0x56,
- BLKID_PRIAM_EDISK_PARTITION = 0x5c,
- BLKID_SPEEDSTOR_PARTITION = 0x61,
- BLKID_GNU_HURD_PARTITION = 0x63, /* GNU HURD or Mach or Sys V/386 (such as ISC UNIX) */
- BLKID_UNIXWARE_PARTITION = BLKID_GNU_HURD_PARTITION,
- BLKID_NETWARE_286_PARTITION = 0x64,
- BLKID_NETWARE_386_PARTITION = 0x65,
- BLKID_DISKSECURE_MULTIBOOT_PARTITION = 0x70,
- BLKID_PC_IX_PARTITION = 0x75,
- BLKID_OLD_MINIX_PARTITION = 0x80, /* Minix 1.4a and earlier */
- BLKID_MINIX_PARTITION = 0x81, /* Minix 1.4b and later */
- BLKID_LINUX_SWAP_PARTITION = 0x82,
- BLKID_SOLARIS_X86_PARTITION = BLKID_LINUX_SWAP_PARTITION,
- BLKID_LINUX_DATA_PARTITION = 0x83,
- BLKID_OS2_HIDDEN_DRIVE_PARTITION = 0x84,
- BLKID_LINUX_EXTENDED_PARTITION = 0x85,
- BLKID_NTFS_VOL_SET1_PARTITION = 0x86,
- BLKID_NTFS_VOL_SET2_PARTITION = 0x87,
- BLKID_LINUX_PLAINTEXT_PARTITION = 0x88,
- BLKID_LINUX_LVM_PARTITION = 0x8e,
- BLKID_AMOEBA_PARTITION = 0x93,
- BLKID_AMOEBA_BBT_PARTITION = 0x94, /* (bad block table) */
- BLKID_BSD_OS_PARTITION = 0x9f, /* BSDI */
- BLKID_THINKPAD_HIBERNATION_PARTITION = 0xa0,
- BLKID_FREEBSD_PARTITION = 0xa5, /* various BSD flavours */
- BLKID_OPENBSD_PARTITION = 0xa6,
- BLKID_NEXTSTEP_PARTITION = 0xa7,
- BLKID_DARWIN_UFS_PARTITION = 0xa8,
- BLKID_NETBSD_PARTITION = 0xa9,
- BLKID_DARWIN_BOOT_PARTITION = 0xab,
- BLKID_HFS_HFS_PARTITION = 0xaf,
- BLKID_BSDI_FS_PARTITION = 0xb7,
- BLKID_BSDI_SWAP_PARTITION = 0xb8,
- BLKID_BOOTWIZARD_HIDDEN_PARTITION = 0xbb,
- BLKID_SOLARIS_BOOT_PARTITION = 0xbe,
- BLKID_SOLARIS_PARTITION = 0xbf,
- BLKID_DRDOS_FAT12_PARTITION = 0xc1,
- BLKID_DRDOS_FAT16_L32M_PARTITION = 0xc4,
- BLKID_DRDOS_FAT16_PARTITION = 0xc6,
- BLKID_SYRINX_PARTITION = 0xc7,
- BLKID_NONFS_DATA_PARTITION = 0xda,
- BLKID_CPM_CTOS_PARTITION = 0xdb, /* CP/M or Concurrent CP/M or Concurrent DOS or CTOS */
- BLKID_DELL_UTILITY_PARTITION = 0xde, /* Dell PowerEdge Server utilities */
- BLKID_BOOTIT_PARTITION = 0xdf, /* BootIt EMBRM */
- BLKID_DOS_ACCESS_PARTITION = 0xe1, /* DOS access or SpeedStor 12-bit FAT extended partition */
- BLKID_DOS_RO_PARTITION = 0xe3, /* DOS R/O or SpeedStor */
- BLKID_SPEEDSTOR_EXTENDED_PARTITION = 0xe4, /* SpeedStor 16-bit FAT extended partition < 1024 cyl. */
- BLKID_BEOS_FS_PARTITION = 0xeb,
- BLKID_GPT_PARTITION = 0xee, /* Intel EFI GUID Partition Table */
- BLKID_EFI_SYSTEM_PARTITION = 0xef, /* Intel EFI System Partition */
- BLKID_LINUX_PARISC_BOOT_PARTITION = 0xf0, /* Linux/PA-RISC boot loader */
- BLKID_SPEEDSTOR1_PARTITION = 0xf1,
- BLKID_SPEEDSTOR2_PARTITION = 0xf4, /* SpeedStor large partition */
- BLKID_DOS_SECONDARY_PARTITION = 0xf2, /* DOS 3.3+ secondary */
- BLKID_VMWARE_VMFS_PARTITION = 0xfb,
- BLKID_VMWARE_VMKCORE_PARTITION = 0xfc, /* VMware kernel dump partition */
- BLKID_LINUX_RAID_PARTITION = 0xfd, /* New (2.2.x) raid partition with autodetect using persistent superblock */
- BLKID_LANSTEP_PARTITION = 0xfe, /* SpeedStor >1024 cyl. or LANstep */
- BLKID_XENIX_BBT_PARTITION = 0xff, /* Xenix Bad Block Table */
-};
parent = blkid_partlist_get_parent(ls);
if (parent) {
switch(blkid_partition_get_type(parent)) {
- case BLKID_FREEBSD_PARTITION:
+ case MBR_FREEBSD_PARTITION:
name = "freebsd";
break;
- case BLKID_NETBSD_PARTITION:
+ case MBR_NETBSD_PARTITION:
name = "netbsd";
break;
- case BLKID_OPENBSD_PARTITION:
+ case MBR_OPENBSD_PARTITION:
name = "openbsd";
break;
default:
unsigned char type;
const struct blkid_idinfo *id;
} dos_nested[] = {
- { BLKID_FREEBSD_PARTITION, &bsd_pt_idinfo },
- { BLKID_NETBSD_PARTITION, &bsd_pt_idinfo },
- { BLKID_OPENBSD_PARTITION, &bsd_pt_idinfo },
- { BLKID_UNIXWARE_PARTITION, &unixware_pt_idinfo },
- { BLKID_SOLARIS_X86_PARTITION, &solaris_x86_pt_idinfo },
- { BLKID_MINIX_PARTITION, &minix_pt_idinfo }
+ { MBR_FREEBSD_PARTITION, &bsd_pt_idinfo },
+ { MBR_NETBSD_PARTITION, &bsd_pt_idinfo },
+ { MBR_OPENBSD_PARTITION, &bsd_pt_idinfo },
+ { MBR_UNIXWARE_PARTITION, &unixware_pt_idinfo },
+ { MBR_SOLARIS_X86_PARTITION, &solaris_x86_pt_idinfo },
+ { MBR_MINIX_PARTITION, &minix_pt_idinfo }
};
static inline int is_extended(struct dos_partition *p)
{
- return (p->sys_type == BLKID_DOS_EXTENDED_PARTITION ||
- p->sys_type == BLKID_W95_EXTENDED_PARTITION ||
- p->sys_type == BLKID_LINUX_EXTENDED_PARTITION);
+ return (p->sys_type == MBR_DOS_EXTENDED_PARTITION ||
+ p->sys_type == MBR_W95_EXTENDED_PARTITION ||
+ p->sys_type == MBR_LINUX_EXTENDED_PARTITION);
}
static int parse_dos_extended(blkid_probe pr, blkid_parttable tab,
* GPT uses valid MBR
*/
for (p = p0, i = 0; i < 4; i++, p++) {
- if (p->sys_type == BLKID_GPT_PARTITION) {
+ if (p->sys_type == MBR_GPT_PARTITION) {
DBG(LOWPROBE, blkid_debug("probably GPT -- ignore"));
goto nothing;
}
p = (struct dos_partition *) (data + BLKID_MSDOS_PT_OFFSET);
for (i = 0; i < 4; i++, p++) {
- if (p->sys_type == BLKID_GPT_PARTITION)
+ if (p->sys_type == MBR_GPT_PARTITION)
goto ok;
}
failed:
if (!parent)
goto nothing;
- if (blkid_partition_get_type(parent) != BLKID_MINIX_PARTITION)
+ if (blkid_partition_get_type(parent) != MBR_MINIX_PARTITION)
goto nothing;
if (blkid_partitions_need_typeonly(pr))
uint32_t start, size;
blkid_partition par;
- if (p->sys_type != BLKID_MINIX_PARTITION)
+ if (p->sys_type != MBR_MINIX_PARTITION)
continue;
start = dos_partition_start(p);
if (par->partno > 4)
return 'L'; /* logical */
- if(par->type == BLKID_DOS_EXTENDED_PARTITION ||
- par->type == BLKID_W95_EXTENDED_PARTITION ||
- par->type == BLKID_LINUX_EXTENDED_PARTITION)
+ if(par->type == MBR_DOS_EXTENDED_PARTITION ||
+ par->type == MBR_W95_EXTENDED_PARTITION ||
+ par->type == MBR_LINUX_EXTENDED_PARTITION)
return 'E';
}
return 'P';
#define BLKID_PARTITIONS_H
#include "blkidP.h"
-#include "blkid_parttypes.h"
+#include "pt-mbr.h"
extern int blkid_partitions_get_flags(blkid_probe pr);
projects / thirdparty / util-linux.git / commitdiff
