---

yaml --- r: 359392 b: refs/heads/master c: 86ee8ba h: refs/heads/master v: v3
git-mirror · Feb 28, 2013 · 138e7f5 · 138e7f5
1 parent 0bfa4a8
commit 138e7f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c94ce6f48f484bbc4dba83c0ed1f98f5e10957c
+refs/heads/master: 86ee8ba64daf5e09a71e4c216f81fae8d1c937f3
diff --git a/trunk/block/partitions/msdos.c b/trunk/block/partitions/msdos.c
@@ -455,14 +455,19 @@ int msdos_partition(struct parsed_partitions *state)
 	data = read_part_sector(state, 0, &sect);
 	if (!data)
 		return -1;
-	if (!msdos_magic_present(data + 510)) {
+
+	/*
+	 * Note order! (some AIX disks, e.g. unbootable kind,
+	 * have no MSDOS 55aa)
+	 */
+	if (aix_magic_present(state, data)) {
 		put_dev_sector(sect);
+		strlcat(state->pp_buf, " [AIX]", PAGE_SIZE);
 		return 0;
 	}
 
-	if (aix_magic_present(state, data)) {
+	if (!msdos_magic_present(data + 510)) {
 		put_dev_sector(sect);
-		strlcat(state->pp_buf, " [AIX]", PAGE_SIZE);
 		return 0;
 	}