Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/fdisk_osf.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/fdisk_osf.c (modified) (2 diffs)

branches/3.3/mindi-busybox/util-linux/fdisk_osf.c

@@ -367 +367 @@
                 printf("Reading disklabel of %s at sector %u\n",
                     partname(disk_device, t+1, 0), ss + BSD_LABELSECTOR);
-            if (xbsd_readlabel(xbsd_part) == 0)
+            if (xbsd_readlabel(xbsd_part) == 0) {
                 if (xbsd_create_disklabel() == 0)
                     return;
                 break;
+            }
         }
     }
@@ -855 +856 @@
     d->d_magic = BSD_DISKMAGIC;
 
-    if (strncmp(disk_device, "/dev/sd", 7) == 0)
+    if (is_prefixed_with(disk_device, "/dev/sd"))
         d->d_type = BSD_DTYPE_SCSI;
     else