kern/51208: Add endian independent disklabel support to system with MBR support

To: kern-bug-people%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,netbsd-bugs%netbsd.org@localhost
Subject: kern/51208: Add endian independent disklabel support to system with MBR support
From: rokuyama%rk.phys.keio.ac.jp@localhost
Date: Wed, 1 Jun 2016 14:35:00 +0000 (UTC)
>Number:         51208
>Category:       kern
>Synopsis:       Add endian independent disklabel support to system with MBR support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kern-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 01 14:35:00 +0000 2016
>Originator:     Rin Okuyama
>Release:        7.99.30
>Organization:
Faculty of Science and Technology, Keio University
>Environment:
NetBSD XXX 7.99.30 NetBSD 7.99.30 (XXX) #0: Wed Jun  1 18:54:40 JST 2016  rin@XXX:/var/build/obj/amd64/sys/arch/amd64/compile/XXX amd64
>Description:
A FFS (LFS) partition written in the other byte order can be mounted
with the FFS_EI (LFS_EI) option enabled. However, unfortunately, when
a disklabel is also written in the other byte order, the kernel cannot
find any partitions in that disk.

The patch below adds the DISKLABEL_EI option, which enables the kernel
to recognize a disklabel in the other byte order; you can mount or
swapon partitions in disks whose disklabel is in the other byte order.
For writing, if a label already exists, its byte order is preserved.
Otherwise, a new label is written in the native byte order.

To specify the byte order explicitly, you can use -F option of
disklabel(8) together with -B option in order to avoid using ioctl(2),
which results in the default behavior described above.

This option is limited to ports/machines that support Master Boot
Record (MBR) labels, i.e., using sys/kern/subr_disk_mbr.c. I have
tested on amd64, evbearmv7hf-e[bl], and i386 ports.

Note that the patch adds a function which swap the byte order of
struct disklabel. I found similar functions at least in
sys/arch/sh3/sh3/disksubr.c, sys/dev/dkwedge/dkwedge_bsdlabel.c,
and sbin/disklabel/bswap.c. I don't know where it should be.

Also, I found a possible bug in mbr_scan() in subr_disk_mbr.c. Please
refer a comment in the patch.

Finally, I thank tsutsui@ for useful comments on Twitter.
>How-To-Repeat:
For example, on amd64, you cannot mount a FFS partition in a diskimage
for evbearmv7hf-eb obtained from [1]:

  % sudo vnconfig vnd0 armv7.img
  % disklabel vnd0
    (snip)
  5 partitions:
  #        size    offset     fstype [fsize bsize cpg/sgs]
   d:   2277856         0     unused      0     0        # (Cyl.      0 -   1112*)
   e:    114688      8192      MSDOS                     # (Cyl.      4 -     59)
  % disklabel -B be vnd0
    (snip)
  8 partitions:
  #        size    offset     fstype [fsize bsize cpg/sgs]
   a:   1892832    385024     4.2BSD      0     0     0  # (Cyl.    188 -   1112*)
   b:    262144    122880       swap                     # (Cyl.     60 -    187)
   c:   2277856         0     unused      0     0        # (Cyl.      0 -   1112*)
   d:   2277856         0     unused      0     0        # (Cyl.      0 -   1112*)
   e:    114688      8192      MSDOS                     # (Cyl.      4 -     59)
  % sudo mount /dev/vnd0a /mnt
  mount: cannot open `/dev/vnd0a': Device not configured

After apllying the patch below, you can mount the partition:

  % disklabel vnd0
    (snip)
  8 partitions:
  #        size    offset     fstype [fsize bsize cpg/sgs]
   a:   1892832    385024     4.2BSD      0     0     0  # (Cyl.    188 -   1112*)
   b:    262144    122880       swap                     # (Cyl.     60 -    187)
   c:   2277856         0     unused      0     0        # (Cyl.      0 -   1112*)
   d:   2277856         0     unused      0     0        # (Cyl.      0 -   1112*)
   e:    114688      8192      MSDOS                     # (Cyl.      4 -     59)
  % sudo mount /dev/vnd0a /mnt
  % ls /mnt
  altroot boot    etc     lib     libexec proc    root    stand   usr
  bin     dev     kern    libdata mnt     rescue  sbin    tmp     var

[1] ftp://nyftp.netbsd.org/pub/NetBSD-daily/HEAD/YYYYMMDDXXXXZ/evbarm-earmv7hfeb/binary/gzimg/armv7.img.gz
>Fix:
PATCH FOR KERNEL AND MANPAGE
============================

--- ./src/share/man/man4/options.4.orig	2016-06-01 19:17:50.548325847 +0900
+++ ./src/share/man/man4/options.4	2016-06-01 20:54:11.659308081 +0900
@@ -929,6 +929,33 @@
 .El
 .Ss File System Options
 .Bl -ohang
+.It Cd options DISKLABEL_EI
+Enable
+.Dq Endian-Independent
+.Xr disklabel 5
+support.
+This allows a system to recognize a disklabel written in the other byte order.
+For writing, when a label already exists, its byte order is preserved.
+Otherwise, a new label is written in the native byte order.
+To specify the byte order explicitly,
+.Fl F
+option of
+.Xr disklabel 8
+should be used with
+.Fl B
+option in order to avoid using
+.Xr ioctl 2 ,
+which results in the default behavior explained above.
+At the moment this is limited to the following ports:
+amd64, bebox, emips, epoc32, evbarm, i386, ibmnws, landisk, mvmeppc, prep,
+.\" riscv,
+rs6000, sandpoint,
+.\" usermode,
+xen, and zaurus.
+And to machines of
+.\" evbarm64,
+evbmips and evbppc ports that support
+Master Boot Record (MBR) labels.
 .It Cd options MAGICLINKS
 Enables the expansion of special strings
 .Po
--- ./src/sys/kern/subr_disk_mbr.c.orig	2016-06-01 19:17:59.840897976 +0900
+++ ./src/sys/kern/subr_disk_mbr.c	2016-06-01 20:15:36.016979858 +0900
@@ -117,6 +117,10 @@
 static int look_netbsd_part(mbr_args_t *, mbr_partition_t *, int, uint);
 static int write_netbsd_label(mbr_args_t *, mbr_partition_t *, int, uint);
 
+#ifdef DISKLABEL_EI
+static void swap_disklabel(struct disklabel *, struct disklabel *);
+#endif
+
 static int
 read_sector(mbr_args_t *a, uint sector, int count)
 {
@@ -187,8 +191,18 @@
 					ok = false;
 
 			if (ok) {
+#if 0
 				this_ext = le32toh(a->lp->d_secpercyl /
 				    a->lp->d_ntracks);
+#else
+				/*
+				 * XXX The disklabel is written in the native
+				 * byte order; we do not need an extra le32toh
+				 * unlike the case of MBR.
+				 */
+				this_ext = a->lp->d_secpercyl /
+				    a->lp->d_ntracks;
+#endif
 				continue;
 			}
 		}
@@ -565,12 +579,23 @@
 }
 
 
+#ifdef DISKLABEL_EI
+/*
+ * - For read, convert a label to the native byte order.
+ * - For update or write, if a label already exists, keep its byte order.
+ *   Otherwise, write a new label in the native byte order.
+ */
+#endif
 static int
 validate_label(mbr_args_t *a, uint label_sector)
 {
 	struct disklabel *dlp;
 	char *dlp_lim, *dlp_byte;
 	int error;
+#ifdef DISKLABEL_EI
+	int swapped = 0;
+	uint16_t npartitions;
+#endif
 
 	/* Next, dig out disk label */
 	if (read_sector(a, label_sector, SCANBLOCKS)) {
@@ -603,8 +628,31 @@
 			break;
 		}
 		if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC)
+#ifdef DISKLABEL_EI
+		{
+			if (bswap32(dlp->d_magic)  != DISKMAGIC ||
+			    bswap32(dlp->d_magic2) != DISKMAGIC)
+				continue;
+
+			/*
+			 * The label is in the other byte order. We need to
+			 * checksum before swapping the byte order.
+			 */
+			npartitions = bswap16(dlp->d_npartitions);
+			if (npartitions > MAXPARTITIONS ||
+			    dkcksum_sized(dlp, npartitions) != 0)
+				goto corrupted;
+
+			swapped = 1;
+		}
+#else
 			continue;
-		if (dlp->d_npartitions > MAXPARTITIONS || dkcksum(dlp) != 0) {
+#endif
+		else if (dlp->d_npartitions > MAXPARTITIONS ||
+			 dkcksum(dlp) != 0) {
+#ifdef DISKLABEL_EI
+corrupted:
+#endif
 			a->msg = "disk label corrupted";
 			continue;
 		}
@@ -613,7 +661,14 @@
 
 	switch (a->action) {
 	case READ_LABEL:
+#ifdef DISKLABEL_EI
+		if (swapped)
+			swap_disklabel(a->lp, dlp);
+		else
+			*a->lp = *dlp;
+#else
 		*a->lp = *dlp;
+#endif
 		if ((a->msg = convertdisklabel(a->lp, a->strat, a->bp,
 		                              a->secperunit)) != NULL)
 			return SCAN_ERROR;
@@ -621,7 +676,15 @@
 		return SCAN_FOUND;
 	case UPDATE_LABEL:
 	case WRITE_LABEL:
+#ifdef DISKLABEL_EI
+		/* DO NOT swap a->lp itself for later references. */
+		if (swapped)
+			swap_disklabel(dlp, a->lp);
+		else
+			*dlp = *a->lp;
+#else
 		*dlp = *a->lp;
+#endif
 		a->bp->b_oflags &= ~BO_DONE;
 		a->bp->b_flags &= ~B_READ;
 		a->bp->b_flags |= B_WRITE;
@@ -663,7 +726,7 @@
 	}
 
 	if (nlp->d_magic != DISKMAGIC || nlp->d_magic2 != DISKMAGIC ||
-	    dkcksum(nlp) != 0)
+	    nlp->d_npartitions > MAXPARTITIONS || dkcksum(nlp) != 0)
 		return (EINVAL);
 
 	/* XXX missing check if other dos partitions will be overwritten */
@@ -738,3 +801,83 @@
 
 	return validate_label(a, ptn_base);
 }
+
+#ifdef DISKLABEL_EI
+/*
+ * from sh3/disksubr.c with modifications:
+ *	- update d_checksum properly
+ *	- replace memcpy(9) by memmove(9) as a precaution
+ */
+static void
+swap_disklabel(struct disklabel *nlp, struct disklabel *olp)
+{
+	int i;
+	uint16_t npartitions;
+
+#define	SWAP16(x)	nlp->x = bswap16(olp->x)
+#define	SWAP32(x)	nlp->x = bswap32(olp->x)
+
+	SWAP32(d_magic);
+	SWAP16(d_type);
+	SWAP16(d_subtype);
+	/* Do not need to swap char strings. */
+	memmove(nlp->d_typename, olp->d_typename, sizeof(nlp->d_typename));
+
+	/* XXX What should we do for d_un (an union of char and pointers) ? */
+	memmove(nlp->d_packname, olp->d_packname, sizeof(nlp->d_packname));
+
+	SWAP32(d_secsize);
+	SWAP32(d_nsectors);
+	SWAP32(d_ntracks);
+	SWAP32(d_ncylinders);
+	SWAP32(d_secpercyl);
+	SWAP32(d_secperunit);
+
+	SWAP16(d_sparespertrack);
+	SWAP16(d_sparespercyl);
+
+	SWAP32(d_acylinders);
+
+	SWAP16(d_rpm);
+	SWAP16(d_interleave);
+	SWAP16(d_trackskew);
+	SWAP16(d_cylskew);
+	SWAP32(d_headswitch);
+	SWAP32(d_trkseek);
+	SWAP32(d_flags);
+	for (i = 0; i < NDDATA; i++)
+		SWAP32(d_drivedata[i]);
+	for (i = 0; i < NSPARE; i++)
+		SWAP32(d_spare[i]);
+	SWAP32(d_magic2);
+	/* d_checksum is updated later. */
+
+	SWAP16(d_npartitions);
+	SWAP32(d_bbsize);
+	SWAP32(d_sbsize);
+	for (i = 0; i < MAXPARTITIONS; i++) {
+		SWAP32(d_partitions[i].p_size);
+		SWAP32(d_partitions[i].p_offset);
+		SWAP32(d_partitions[i].p_fsize);
+		/* p_fstype and p_frag is uint8_t, so no need to swap. */
+		nlp->d_partitions[i].p_fstype = olp->d_partitions[i].p_fstype;
+		nlp->d_partitions[i].p_frag = olp->d_partitions[i].p_frag;
+		SWAP16(d_partitions[i].p_cpg);
+	}
+
+#undef SWAP16
+#undef SWAP32
+
+	/* Update checksum in the target endian. */
+	nlp->d_checksum = 0;
+	npartitions = nlp->d_magic == DISKMAGIC ?
+	    nlp->d_npartitions : olp->d_npartitions;
+	/*
+	 * npartitions can be larger than MAXPARTITIONS when the label was not
+	 * validated by setdisklabel. If so, the label is intentionally(?)
+	 * corrupted and checksum should be meaningless.
+	 */
+	if (npartitions <= MAXPARTITIONS)
+		nlp->d_checksum = dkcksum_sized(nlp, npartitions);
+}
+#endif /* DISKLABEL_EI */

PATCH FOR KERNEL CONFIGURATION FILES
====================================

--- ./src/sys/arch/amd64/conf/ALL.orig	2016-06-01 07:15:01.883900365 +0900
+++ ./src/sys/arch/amd64/conf/ALL	2016-06-01 17:43:03.059914329 +0900
@@ -195,6 +195,7 @@
 file-system	CHFS		# Chip File System
 
 # File system options
+options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/amd64/conf/GENERIC.orig	2016-06-01 07:15:01.884912959 +0900
+++ ./src/sys/arch/amd64/conf/GENERIC	2016-06-01 17:43:09.613811701 +0900
@@ -171,6 +171,7 @@
 #file-system	NILFS		# experimental - NTT's NiLFS(2)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/amd64/conf/XEN3_DOM0.orig	2016-06-01 17:56:13.401848929 +0900
+++ ./src/sys/arch/amd64/conf/XEN3_DOM0	2016-06-01 17:56:38.778303342 +0900
@@ -107,6 +107,7 @@
 file-system 	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/amd64/conf/XEN3_DOMU.orig	2016-06-01 17:56:19.222828126 +0900
+++ ./src/sys/arch/amd64/conf/XEN3_DOMU	2016-06-01 17:56:51.717099242 +0900
@@ -101,6 +101,7 @@
 file-system 	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/bebox/conf/GENERIC.orig	2016-06-01 17:55:27.213387969 +0900
+++ ./src/sys/arch/bebox/conf/GENERIC	2016-06-01 17:55:45.053423817 +0900
@@ -97,6 +97,7 @@
 #file-system	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/emips/conf/GENERIC.orig	2016-06-01 17:58:47.157492326 +0900
+++ ./src/sys/arch/emips/conf/GENERIC	2016-06-01 17:59:14.084642681 +0900
@@ -88,6 +88,7 @@
 file-system	TMPFS		# Efficient memory file-system
 file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	NFSSERVER	# Sun NFS-compatible filesystem (server)
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
--- ./src/sys/arch/epoc32/conf/GENERIC.orig	2016-06-01 17:59:45.586187463 +0900
+++ ./src/sys/arch/epoc32/conf/GENERIC	2016-06-01 18:00:12.441061971 +0900
@@ -47,6 +47,7 @@
 file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ADI_BRH.orig	2016-06-01 18:03:34.234403079 +0900
+++ ./src/sys/arch/evbarm/conf/ADI_BRH	2016-06-01 18:04:06.662414362 +0900
@@ -46,6 +46,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ARMADAXP.orig	2016-06-01 18:04:09.522141505 +0900
+++ ./src/sys/arch/evbarm/conf/ARMADAXP	2016-06-01 18:04:29.718814797 +0900
@@ -48,6 +48,7 @@
 file-system	PUFFS		# Pass-to-Userspace Framework File System
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3.orig	2016-06-01 18:04:32.853004001 +0900
+++ ./src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3	2016-06-01 18:04:46.450563836 +0900
@@ -129,6 +129,7 @@
 #file-system	NILFS		# experimental - NTT's NiLFS(2)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ARMADILLO210.orig	2016-06-01 18:04:48.912739608 +0900
+++ ./src/sys/arch/evbarm/conf/ARMADILLO210	2016-06-01 18:04:59.824422473 +0900
@@ -39,6 +39,7 @@
 #file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ARMADILLO9.orig	2016-06-01 18:05:00.987865745 +0900
+++ ./src/sys/arch/evbarm/conf/ARMADILLO9	2016-06-01 18:05:08.514327280 +0900
@@ -39,6 +39,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/BCM5301X.orig	2016-06-01 18:05:08.515833573 +0900
+++ ./src/sys/arch/evbarm/conf/BCM5301X	2016-06-01 18:05:14.282155333 +0900
@@ -53,6 +53,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/BCM56340.orig	2016-06-01 18:05:14.284180203 +0900
+++ ./src/sys/arch/evbarm/conf/BCM56340	2016-06-01 18:05:21.146915498 +0900
@@ -53,6 +53,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/BEAGLEBOARD.orig	2016-06-01 18:05:21.148136664 +0900
+++ ./src/sys/arch/evbarm/conf/BEAGLEBOARD	2016-06-01 18:05:27.411776841 +0900
@@ -45,6 +45,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/BEAGLEBOARDXM.orig	2016-06-01 18:05:29.153090611 +0900
+++ ./src/sys/arch/evbarm/conf/BEAGLEBOARDXM	2016-06-01 18:05:38.329468385 +0900
@@ -44,6 +44,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/BEAGLEBONE.orig	2016-06-01 18:05:38.330959733 +0900
+++ ./src/sys/arch/evbarm/conf/BEAGLEBONE	2016-06-01 18:05:47.645973257 +0900
@@ -48,6 +48,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/CP3100.orig	2016-06-01 18:05:48.723244377 +0900
+++ ./src/sys/arch/evbarm/conf/CP3100	2016-06-01 18:05:56.170225057 +0900
@@ -46,6 +46,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/CUBOX-I.orig	2016-06-01 18:06:00.504483267 +0900
+++ ./src/sys/arch/evbarm/conf/CUBOX-I	2016-06-01 18:06:07.426024785 +0900
@@ -127,6 +127,7 @@
 #file-system	NILFS		# experimental - NTT's NiLFS(2)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/EXYNOS.orig	2016-06-01 18:06:09.253815105 +0900
+++ ./src/sys/arch/evbarm/conf/EXYNOS	2016-06-01 18:06:15.761521025 +0900
@@ -71,6 +71,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/GEMINI.orig	2016-06-01 18:06:15.762994217 +0900
+++ ./src/sys/arch/evbarm/conf/GEMINI	2016-06-01 18:06:22.602447401 +0900
@@ -41,6 +41,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/GEMINI_MASTER.orig	2016-06-01 18:06:24.390398484 +0900
+++ ./src/sys/arch/evbarm/conf/GEMINI_MASTER	2016-06-01 18:06:32.292324178 +0900
@@ -42,6 +42,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/GEMINI_SLAVE.orig	2016-06-01 18:06:32.759975688 +0900
+++ ./src/sys/arch/evbarm/conf/GEMINI_SLAVE	2016-06-01 18:06:40.446505048 +0900
@@ -41,6 +41,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/GOLDENGATE.orig	2016-06-01 18:06:47.141616023 +0900
+++ ./src/sys/arch/evbarm/conf/GOLDENGATE	2016-06-01 18:06:57.281390723 +0900
@@ -50,6 +50,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/GUMSTIX.orig	2016-06-01 18:06:57.282954697 +0900
+++ ./src/sys/arch/evbarm/conf/GUMSTIX	2016-06-01 18:07:02.388715724 +0900
@@ -60,6 +60,7 @@
 #file-system 	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/HDL_G.orig	2016-06-01 18:07:02.390797788 +0900
+++ ./src/sys/arch/evbarm/conf/HDL_G	2016-06-01 18:07:08.468142671 +0900
@@ -49,6 +49,7 @@
 file-system	UNION		# union file system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/HPT5325.orig	2016-06-01 18:07:08.469454758 +0900
+++ ./src/sys/arch/evbarm/conf/HPT5325	2016-06-01 18:07:13.421076603 +0900
@@ -56,6 +56,7 @@
 #file-system 	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/IGEPV2.orig	2016-06-01 18:07:13.422607756 +0900
+++ ./src/sys/arch/evbarm/conf/IGEPV2	2016-06-01 18:07:21.517030705 +0900
@@ -44,6 +44,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/IMX31LITE.orig	2016-06-01 18:07:21.518230432 +0900
+++ ./src/sys/arch/evbarm/conf/IMX31LITE	2016-06-01 18:07:27.593363918 +0900
@@ -45,6 +45,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/INTEGRATOR.orig	2016-06-01 18:07:27.594853381 +0900
+++ ./src/sys/arch/evbarm/conf/INTEGRATOR	2016-06-01 18:07:33.406440502 +0900
@@ -46,6 +46,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/INTEGRATOR_CP.orig	2016-06-01 18:07:33.408415861 +0900
+++ ./src/sys/arch/evbarm/conf/INTEGRATOR_CP	2016-06-01 18:07:38.395989699 +0900
@@ -45,6 +45,7 @@
 file-system	TMPFS		# memory file system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/IQ31244.orig	2016-06-01 18:07:38.397178601 +0900
+++ ./src/sys/arch/evbarm/conf/IQ31244	2016-06-01 18:07:45.036680559 +0900
@@ -46,6 +46,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/IQ80310.orig	2016-06-01 18:07:45.038158639 +0900
+++ ./src/sys/arch/evbarm/conf/IQ80310	2016-06-01 18:07:50.051451878 +0900
@@ -46,6 +46,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/IQ80321.orig	2016-06-01 18:07:50.052659146 +0900
+++ ./src/sys/arch/evbarm/conf/IQ80321	2016-06-01 18:07:55.441228918 +0900
@@ -46,6 +46,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/IXDP425.orig	2016-06-01 18:07:55.442757767 +0900
+++ ./src/sys/arch/evbarm/conf/IXDP425	2016-06-01 18:08:00.868346928 +0900
@@ -50,6 +50,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/IXM1200.orig	2016-06-01 18:08:00.869550914 +0900
+++ ./src/sys/arch/evbarm/conf/IXM1200	2016-06-01 18:08:05.765286229 +0900
@@ -45,6 +45,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/LUBBOCK.orig	2016-06-01 18:08:05.766745175 +0900
+++ ./src/sys/arch/evbarm/conf/LUBBOCK	2016-06-01 18:08:11.628898955 +0900
@@ -44,6 +44,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/MARVELL_NAS.orig	2016-06-01 18:08:11.630145958 +0900
+++ ./src/sys/arch/evbarm/conf/MARVELL_NAS	2016-06-01 18:08:16.606111912 +0900
@@ -52,6 +52,7 @@
 file-system 	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/MINI2440.orig	2016-06-01 18:08:16.607642157 +0900
+++ ./src/sys/arch/evbarm/conf/MINI2440	2016-06-01 18:08:22.200199052 +0900
@@ -71,6 +71,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 #options 	NFSSERVER
--- ./src/sys/arch/evbarm/conf/MMNET_GENERIC.orig	2016-06-01 18:08:22.201515539 +0900
+++ ./src/sys/arch/evbarm/conf/MMNET_GENERIC	2016-06-01 18:08:26.803260200 +0900
@@ -145,6 +145,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 options 	WAPBL		# File system journaling support
--- ./src/sys/arch/evbarm/conf/MPCSA_GENERIC.orig	2016-06-01 18:08:26.804896871 +0900
+++ ./src/sys/arch/evbarm/conf/MPCSA_GENERIC	2016-06-01 18:08:33.655323342 +0900
@@ -141,6 +141,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/MV2120.orig	2016-06-01 18:08:33.656899607 +0900
+++ ./src/sys/arch/evbarm/conf/MV2120	2016-06-01 18:08:38.454566758 +0900
@@ -57,6 +57,7 @@
 file-system 	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 options 	WAPBL		# File system journaling support
--- ./src/sys/arch/evbarm/conf/N900.orig	2016-06-01 18:08:38.455817602 +0900
+++ ./src/sys/arch/evbarm/conf/N900	2016-06-01 18:08:44.407080902 +0900
@@ -45,6 +45,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/NAPPI.orig	2016-06-01 18:08:44.408540337 +0900
+++ ./src/sys/arch/evbarm/conf/NAPPI	2016-06-01 18:08:50.441951395 +0900
@@ -45,6 +45,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/NITROGEN6X.orig	2016-06-01 18:08:50.443206010 +0900
+++ ./src/sys/arch/evbarm/conf/NITROGEN6X	2016-06-01 18:08:55.887785552 +0900
@@ -127,6 +127,7 @@
 #file-system	NILFS		# experimental - NTT's NiLFS(2)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/NSLU2.orig	2016-06-01 18:08:55.889296314 +0900
+++ ./src/sys/arch/evbarm/conf/NSLU2	2016-06-01 18:09:02.106802986 +0900
@@ -52,6 +52,7 @@
 #file-system	UNION		# union file system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ODROID-U.orig	2016-06-01 18:09:02.108016400 +0900
+++ ./src/sys/arch/evbarm/conf/ODROID-U	2016-06-01 18:09:06.703974087 +0900
@@ -57,6 +57,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ODROID-XU.orig	2016-06-01 18:09:06.705436175 +0900
+++ ./src/sys/arch/evbarm/conf/ODROID-XU	2016-06-01 18:09:12.862266633 +0900
@@ -55,6 +55,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/OMAP5EVM.orig	2016-06-01 18:09:12.864306378 +0900
+++ ./src/sys/arch/evbarm/conf/OMAP5EVM	2016-06-01 18:09:18.192248460 +0900
@@ -46,6 +46,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/OPENBLOCKS_A6.orig	2016-06-01 18:09:18.193520953 +0900
+++ ./src/sys/arch/evbarm/conf/OPENBLOCKS_A6	2016-06-01 18:09:23.085778797 +0900
@@ -54,6 +54,7 @@
 #file-system 	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/OPENBLOCKS_AX3.orig	2016-06-01 18:09:23.087341025 +0900
+++ ./src/sys/arch/evbarm/conf/OPENBLOCKS_AX3	2016-06-01 18:09:27.866225186 +0900
@@ -62,6 +62,7 @@
 file-system 	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/OSK5912.orig	2016-06-01 18:09:27.867430150 +0900
+++ ./src/sys/arch/evbarm/conf/OSK5912	2016-06-01 18:09:33.408632587 +0900
@@ -39,6 +39,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/OVERO.orig	2016-06-01 18:09:33.410158782 +0900
+++ ./src/sys/arch/evbarm/conf/OVERO	2016-06-01 18:09:38.093278564 +0900
@@ -61,6 +61,7 @@
 #file-system	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/PANDABOARD.orig	2016-06-01 18:09:38.094521867 +0900
+++ ./src/sys/arch/evbarm/conf/PANDABOARD	2016-06-01 18:09:43.090338887 +0900
@@ -44,6 +44,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/SHEEVAPLUG.orig	2016-06-01 18:09:43.092395461 +0900
+++ ./src/sys/arch/evbarm/conf/SHEEVAPLUG	2016-06-01 18:09:48.181684947 +0900
@@ -56,6 +56,7 @@
 #file-system 	HFS		# experimental - Apple HFS+ (read-only)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/SMDK2410.orig	2016-06-01 18:09:48.182966517 +0900
+++ ./src/sys/arch/evbarm/conf/SMDK2410	2016-06-01 18:09:56.259016718 +0900
@@ -57,6 +57,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/SMDK2800.orig	2016-06-01 18:09:56.260536069 +0900
+++ ./src/sys/arch/evbarm/conf/SMDK2800	2016-06-01 18:10:01.258845767 +0900
@@ -53,6 +53,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/TEAMASA_NPWR.orig	2016-06-01 18:10:01.260059181 +0900
+++ ./src/sys/arch/evbarm/conf/TEAMASA_NPWR	2016-06-01 18:10:07.722727686 +0900
@@ -50,6 +50,7 @@
 file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC.orig	2016-06-01 18:10:07.724184467 +0900
+++ ./src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC	2016-06-01 18:10:13.050529258 +0900
@@ -47,6 +47,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/TISDP2420.orig	2016-06-01 18:10:13.052533528 +0900
+++ ./src/sys/arch/evbarm/conf/TISDP2420	2016-06-01 18:10:20.305183087 +0900
@@ -44,6 +44,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/TISDP2430.orig	2016-06-01 18:10:20.306400132 +0900
+++ ./src/sys/arch/evbarm/conf/TISDP2430	2016-06-01 18:10:25.504373328 +0900
@@ -43,6 +43,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/TS7200.orig	2016-06-01 18:10:25.505900012 +0900
+++ ./src/sys/arch/evbarm/conf/TS7200	2016-06-01 18:10:30.168682605 +0900
@@ -52,6 +52,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/TWINTAIL.orig	2016-06-01 18:10:30.169967598 +0900
+++ ./src/sys/arch/evbarm/conf/TWINTAIL	2016-06-01 18:10:35.579373067 +0900
@@ -50,6 +50,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/VEXPRESS_A15.orig	2016-06-01 18:10:35.580847237 +0900
+++ ./src/sys/arch/evbarm/conf/VEXPRESS_A15	2016-06-01 18:10:41.615999069 +0900
@@ -52,6 +52,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/VIPER.orig	2016-06-01 18:10:41.617210876 +0900
+++ ./src/sys/arch/evbarm/conf/VIPER	2016-06-01 18:10:47.008688182 +0900
@@ -44,6 +44,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm/conf/ZAO425.orig	2016-06-01 18:10:47.010194684 +0900
+++ ./src/sys/arch/evbarm/conf/ZAO425	2016-06-01 18:10:52.936246247 +0900
@@ -50,6 +50,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbarm64/conf/A64EMUL.orig	2016-06-01 18:12:49.741216697 +0900
+++ ./src/sys/arch/evbarm64/conf/A64EMUL	2016-06-01 18:13:00.993750163 +0900
@@ -71,6 +71,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbmips/conf/ADM5120.orig	2016-06-01 18:20:12.623044344 +0900
+++ ./src/sys/arch/evbmips/conf/ADM5120	2016-06-01 18:23:44.754330033 +0900
@@ -71,6 +71,7 @@
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
--- ./src/sys/arch/evbmips/conf/ADM5120-NB.orig	2016-06-01 18:20:21.331904988 +0900
+++ ./src/sys/arch/evbmips/conf/ADM5120-NB	2016-06-01 18:23:35.094317753 +0900
@@ -71,6 +71,7 @@
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
--- ./src/sys/arch/evbmips/conf/ADM5120-USB.orig	2016-06-01 18:20:29.859779181 +0900
+++ ./src/sys/arch/evbmips/conf/ADM5120-USB	2016-06-01 18:23:39.942131978 +0900
@@ -67,6 +67,7 @@
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
--- ./src/sys/arch/evbmips/conf/RB153.orig	2016-06-01 18:20:36.721161174 +0900
+++ ./src/sys/arch/evbmips/conf/RB153	2016-06-01 18:26:28.676860015 +0900
@@ -56,6 +56,7 @@
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
--- ./src/sys/arch/evbmips/conf/GDIUM.orig	2016-06-01 18:21:33.314185145 +0900
+++ ./src/sys/arch/evbmips/conf/GDIUM	2016-06-01 18:25:56.481693966 +0900
@@ -82,7 +82,9 @@
 #file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	NFSSERVER	# Sun NFS-compatible filesystem (server)
+#options 	FFS_EI		# FFS Endian Independent support
 options 	WAPBL		# File system journaling support
 #options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 #options 	QUOTA		# legacy UFS quotas
--- ./src/sys/arch/evbmips/conf/CI20.orig	2016-06-01 18:21:49.799955512 +0900
+++ ./src/sys/arch/evbmips/conf/CI20	2016-06-01 18:23:51.186189458 +0900
@@ -92,6 +92,7 @@
 file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
--- ./src/sys/arch/evbmips/conf/LOONGSON.orig	2016-06-01 18:22:23.965715322 +0900
+++ ./src/sys/arch/evbmips/conf/LOONGSON	2016-06-01 18:26:21.296075557 +0900
@@ -90,7 +90,9 @@
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	NFSSERVER	# Sun NFS-compatible filesystem (server)
+#options 	FFS_EI		# FFS Endian Independent support
 options 	WAPBL		# File system journaling support
 #options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 #options 	QUOTA		# legacy UFS quotas
--- ./src/sys/arch/evbmips/conf/ERLITE.orig	2016-06-01 18:22:41.150601103 +0900
+++ ./src/sys/arch/evbmips/conf/ERLITE	2016-06-01 18:24:00.909691716 +0900
@@ -75,6 +75,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	NFSSERVER	# Sun NFS-compatible filesystem server
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
--- ./src/sys/arch/evbmips/conf/CPMBR1400.orig	2016-06-01 18:23:04.162908863 +0900
+++ ./src/sys/arch/evbmips/conf/CPMBR1400	2016-06-01 18:23:55.821819870 +0900
@@ -103,6 +103,7 @@
 file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independant support
 #options 	NFSSERVER	# Network File System server
--- ./src/sys/arch/evbmips/conf/ZYXELKX.orig	2016-06-01 18:23:09.089013007 +0900
+++ ./src/sys/arch/evbmips/conf/ZYXELKX	2016-06-01 18:26:33.939976642 +0900
@@ -99,6 +99,7 @@
 file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independant support
 #options 	NFSSERVER	# Network File System server
--- ./src/sys/arch/evbppc/conf/MPC8536DS.orig	2016-06-01 18:27:34.990419793 +0900
+++ ./src/sys/arch/evbppc/conf/MPC8536DS	2016-06-01 18:29:20.809450144 +0900
@@ -88,6 +88,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/MPC8548CDS.orig	2016-06-01 18:27:44.428311288 +0900
+++ ./src/sys/arch/evbppc/conf/MPC8548CDS	2016-06-01 18:29:24.905685513 +0900
@@ -90,6 +90,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/P2020DS.orig	2016-06-01 18:27:57.929553287 +0900
+++ ./src/sys/arch/evbppc/conf/P2020DS	2016-06-01 18:29:35.515648889 +0900
@@ -95,6 +95,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/P2020RDB.orig	2016-06-01 18:28:12.265817673 +0900
+++ ./src/sys/arch/evbppc/conf/P2020RDB	2016-06-01 18:29:40.051301322 +0900
@@ -90,6 +90,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/RB800.orig	2016-06-01 18:28:19.220029245 +0900
+++ ./src/sys/arch/evbppc/conf/RB800	2016-06-01 18:29:49.846220268 +0900
@@ -93,6 +93,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/RB850GX2.orig	2016-06-01 18:28:27.611520469 +0900
+++ ./src/sys/arch/evbppc/conf/RB850GX2	2016-06-01 18:29:54.320710103 +0900
@@ -90,6 +90,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/TWRP1025.orig	2016-06-01 18:28:33.838283228 +0900
+++ ./src/sys/arch/evbppc/conf/TWRP1025	2016-06-01 18:29:58.739528991 +0900
@@ -90,6 +90,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/OPENBLOCKS600.orig	2016-06-01 18:28:54.911819119 +0900
+++ ./src/sys/arch/evbppc/conf/OPENBLOCKS600	2016-06-01 18:29:30.301285600 +0900
@@ -97,6 +97,7 @@
 # File system options
 #
 
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI			# FFS Endian Independent support
--- ./src/sys/arch/evbppc/conf/PMPPC.orig	2016-06-01 18:29:10.892138892 +0900
+++ ./src/sys/arch/evbppc/conf/PMPPC	2016-06-01 18:29:44.162213159 +0900
@@ -79,6 +79,7 @@
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/i386/conf/ALL.orig	2016-06-01 07:15:03.782815625 +0900
+++ ./src/sys/arch/i386/conf/ALL	2016-06-01 17:43:22.311113547 +0900
@@ -194,6 +194,7 @@
 file-system	CHFS		# Chip File System
 
 # File system options
+options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/i386/conf/GENERIC.orig	2016-06-01 07:15:03.783633707 +0900
+++ ./src/sys/arch/i386/conf/GENERIC	2016-06-01 17:43:27.721164705 +0900
@@ -185,6 +185,7 @@
 #file-system	V7FS		# 7th Edition(V7) File System
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/i386/conf/GENERIC_PS2TINY.orig	2016-06-01 18:13:35.387088431 +0900
+++ ./src/sys/arch/i386/conf/GENERIC_PS2TINY	2016-06-01 18:14:23.654345237 +0900
@@ -86,6 +86,7 @@
 #file-system	CODA		# Coda File System; also needs vcoda (below)
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 options 	WAPBL		# File system journaling support
--- ./src/sys/arch/i386/conf/GENERIC_TINY.orig	2016-06-01 18:13:43.773141535 +0900
+++ ./src/sys/arch/i386/conf/GENERIC_TINY	2016-06-01 18:14:28.807905540 +0900
@@ -100,6 +100,7 @@
 #file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/i386/conf/NET4501.orig	2016-06-01 18:13:51.601224037 +0900
+++ ./src/sys/arch/i386/conf/NET4501	2016-06-01 18:14:33.203410999 +0900
@@ -123,6 +123,7 @@
 #file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/i386/conf/XEN3_DOM0.orig	2016-06-01 18:13:59.998698355 +0900
+++ ./src/sys/arch/i386/conf/XEN3_DOM0	2016-06-01 18:14:38.721067537 +0900
@@ -130,6 +130,7 @@
 file-system 	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/i386/conf/XEN3_DOMU.orig	2016-06-01 18:14:04.575393761 +0900
+++ ./src/sys/arch/i386/conf/XEN3_DOMU	2016-06-01 18:14:43.842757008 +0900
@@ -118,6 +118,7 @@
 #file-system	V7FS		# 7th Edition(V7) File System
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/ibmnws/conf/GENERIC.orig	2016-06-01 18:14:59.166963202 +0900
+++ ./src/sys/arch/ibmnws/conf/GENERIC	2016-06-01 18:15:08.696408536 +0900
@@ -44,6 +44,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	FFS_EI		# FFS Endian Independent support
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 #options 	UFS_EXTATTR	# Extended attribute support for UFS1
--- ./src/sys/arch/landisk/conf/GENERIC.orig	2016-06-01 18:15:24.942620244 +0900
+++ ./src/sys/arch/landisk/conf/GENERIC	2016-06-01 18:15:31.070921731 +0900
@@ -119,6 +119,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/mvmeppc/conf/GENERIC.orig	2016-06-01 18:15:48.994068570 +0900
+++ ./src/sys/arch/mvmeppc/conf/GENERIC	2016-06-01 18:15:55.247022424 +0900
@@ -57,6 +57,7 @@
 file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/prep/conf/GENERIC.orig	2016-06-01 18:16:17.601400926 +0900
+++ ./src/sys/arch/prep/conf/GENERIC	2016-06-01 18:16:36.731765727 +0900
@@ -96,6 +96,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/prep/conf/INSTALL.orig	2016-06-01 18:16:21.258413641 +0900
+++ ./src/sys/arch/prep/conf/INSTALL	2016-06-01 18:16:41.291524508 +0900
@@ -41,6 +41,7 @@
 #file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	FFS_EI		# FFS Endian Independent support
 options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
--- ./src/sys/arch/prep/conf/INSTALL_SMALL.orig	2016-06-01 18:16:27.723722882 +0900
+++ ./src/sys/arch/prep/conf/INSTALL_SMALL	2016-06-01 18:16:45.296276042 +0900
@@ -42,6 +42,7 @@
 #file-system	PTYFS		# /dev/pts/N support
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	FFS_EI		# FFS Endian Independent support
 options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
--- ./src/sys/arch/riscv/conf/GENERIC.orig	2016-06-01 18:17:08.664871324 +0900
+++ ./src/sys/arch/riscv/conf/GENERIC	2016-06-01 18:17:15.904823470 +0900
@@ -91,6 +91,7 @@
 include		"conf/filesystems.config"
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/rs6000/conf/GENERIC.orig	2016-06-01 18:17:30.577807564 +0900
+++ ./src/sys/arch/rs6000/conf/GENERIC	2016-06-01 18:17:36.171865788 +0900
@@ -102,6 +102,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/sandpoint/conf/GENERIC.orig	2016-06-01 18:17:51.435529925 +0900
+++ ./src/sys/arch/sandpoint/conf/GENERIC	2016-06-01 18:17:56.340455369 +0900
@@ -113,6 +113,7 @@
 file-system	TMPFS		# Efficient memory file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 options 	QUOTA		# legacy UFS quotas
 options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
--- ./src/sys/arch/zaurus/conf/GENERIC.orig	2016-06-01 18:18:48.659338070 +0900
+++ ./src/sys/arch/zaurus/conf/GENERIC	2016-06-01 18:18:54.257843303 +0900
@@ -70,6 +70,7 @@
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 
 # File system options
+#options 	DISKLABEL_EI	# disklabel Endian Independent support
 #options 	QUOTA		# legacy UFS quotas
 #options 	QUOTA2		# new, in-filesystem UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
Prev by Date: Re: kern/44433 (rtk cannot program a new MAC address)
Next by Date: Re: toolchain/51105 (python 2.7 crashes while building gstreamer)
Previous by Thread: Re: kern/44433 (rtk cannot program a new MAC address)
Next by Thread: Re: bin/48928 Issue building static X11 clients
Indexes:
Home | Main Index | Thread Index | Old Index