From 7b4c7a681cc4c0a53dc8a8baf4853e921cfbf5de Mon Sep 17 00:00:00 2001
From: bigbiff <bigbiff@teamw.in>
Date: Thu, 1 Jan 2015 19:44:14 -0500
Subject: Update blkid to 2.25.0 Break libblkid into 4 libraries: libblkid,
 libuuid, libutil-linux and libfdisk.

This should help in later patch updates.

Change-Id: I680d9a7feb031e5c29a603e9c58aff4b65826262
---
 libblkid/minix2.c | 100 ------------------------------------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 libblkid/minix2.c

(limited to 'libblkid/minix2.c')

diff --git a/libblkid/minix2.c b/libblkid/minix2.c
deleted file mode 100644
index bd57a6d4b..000000000
--- a/libblkid/minix2.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Minix partition parsing code
- *
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
- *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-
-#include "partitions.h"
-#include "dos.h"
-#include "minix.h"
-
-static int probe_minix_pt(blkid_probe pr,
-		const struct blkid_idmag *mag __attribute__((__unused__)))
-{
-	struct dos_partition *p;
-	blkid_parttable tab = NULL;
-	blkid_partition parent;
-	blkid_partlist ls;
-	unsigned char *data;
-	int i;
-
-	data = blkid_probe_get_sector(pr, 0);
-	if (!data)
-		goto nothing;
-
-	ls = blkid_probe_get_partlist(pr);
-	if (!ls)
-		goto err;
-
-	/* Parent is required, because Minix uses the same PT as DOS and
-	 * difference is only in primary partition (parent) type.
-	 */
-	parent = blkid_partlist_get_parent(ls);
-	if (!parent)
-		goto nothing;
-
-	if (blkid_partition_get_type(parent) != BLKID_MINIX_PARTITION)
-		goto nothing;
-
-	if (blkid_partitions_need_typeonly(pr))
-		/* caller does not ask for details about partitions */
-		return 0;
-
-	p = (struct dos_partition *) (data + BLKID_MSDOS_PT_OFFSET);
-
-	tab = blkid_partlist_new_parttable(ls, "minix", BLKID_MSDOS_PT_OFFSET);
-	if (!tab)
-		goto err;
-
-	for (i = 0; i < MINIX_MAXPARTITIONS; i++, p++) {
-		uint32_t start, size;
-		blkid_partition par;
-
-		if (p->sys_type != BLKID_MINIX_PARTITION)
-			continue;
-
-		start = dos_partition_start(p);
-		size = dos_partition_size(p);
-
-		if (parent && !blkid_is_nested_dimension(parent, start, size)) {
-			DBG(DEBUG_LOWPROBE, printf(
-				"WARNING: minix partition (%d) overflow "
-				"detected, ignore\n", i));
-			continue;
-		}
-
-		par = blkid_partlist_add_partition(ls, tab, start, size);
-		if (!par)
-			goto err;
-
-		blkid_partition_set_type(par, p->sys_type);
-		blkid_partition_set_flags(par, p->boot_ind);
-	}
-
-	return 0;
-
-nothing:
-	return 1;
-err:
-	return -1;
-}
-
-/* same as DOS */
-const struct blkid_idinfo minix_pt_idinfo =
-{
-	.name		= "minix",
-	.probefunc	= probe_minix_pt,
-	.magics		=
-	{
-		{ .magic = "\x55\xAA", .len = 2, .sboff = 510 },
-		{ NULL }
-	}
-};
-
-- 
cgit v1.2.3