Fix atari label false positives

The atari label gets false positives easily, so probe it after all other labels have said no.
depau · Jun 12, 2018 · 395f8aa · 395f8aa
1 parent 4347ddb
commit 395f8aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,8 @@ GNU parted NEWS                                    -*- outline -*-
 
 ** Bug Fixes
 
+  Fix atari disklabel false positives by probing other labels first.
+
   Fix resizepart to adjust the end to be -1 sector when using iec
   power of 2 units so that the next partition can start immediately
   following the new end, just like mkpart does.

diff --git a/libparted/libparted.c b/libparted/libparted.c
@@ -80,12 +80,13 @@ extern void ped_disk_atari_init ();
 static void
 init_disk_types ()
 {
+	/* Note that probing is done in the reverse order of init */
 	ped_disk_loop_init ();	/* must be last in the probe list */
 
 #if defined __s390__ || defined __s390x__
 	ped_disk_dasd_init();
 #endif
-
+	ped_disk_atari_init (); /* easy false positives, so probe others first */
 	ped_disk_sun_init ();
 #ifdef ENABLE_PC98
 	ped_disk_pc98_init ();
@@ -97,7 +98,6 @@ init_disk_types ()
 	ped_disk_bsd_init ();
 	ped_disk_amiga_init ();
 	ped_disk_aix_init ();
-	ped_disk_atari_init ();
 }
 
 extern void ped_file_system_amiga_init (void);