Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/fdisk_osf.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

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

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

@@ -44 +44 @@
 #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
 
-#if defined(i386) || defined(__sparc__) || defined(__arm__) \
- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
- || defined(__s390__) || defined(__s390x__) \
- || defined(__sh__) || defined(__x86_64__) || defined(__avr32__) \
- || defined(__nds32__)
-# define BSD_LABELSECTOR   1
-# define BSD_LABELOFFSET   0
-#elif defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
+#if defined(__alpha__) \
+ || defined(__powerpc__) \
+ || defined(__ia64__) \
  || defined(__hppa__)
 # define BSD_LABELSECTOR   0
 # define BSD_LABELOFFSET   64
 #else
-# error unknown architecture
+# define BSD_LABELSECTOR   1
+# define BSD_LABELOFFSET   0
 #endif
 
@@ -903 +899 @@
 #else
     d->d_npartitions = 3;
-    pp = &d->d_partitions[2];             /* Partition C should be
-                           the whole disk */
+    pp = &d->d_partitions[2]; /* Partition C should be the whole disk */
     pp->p_offset = 0;
     pp->p_size   = d->d_secperunit;
@@ -940 +935 @@
 
     memmove(d, &disklabelbuffer[BSD_LABELSECTOR * SECTOR_SIZE + BSD_LABELOFFSET],
-           sizeof(struct xbsd_disklabel));
+            sizeof(struct xbsd_disklabel));
 
     if (d->d_magic != BSD_DISKMAGIC || d->d_magic2 != BSD_DISKMAGIC)