diff options
author | gjb <gjb@FreeBSD.org> | 2015-07-04 14:50:32 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2015-07-04 14:50:32 +0000 |
commit | 4d6a99d3a91e33384bec13b9ac7de8defe49a32a (patch) | |
tree | c13e769a99a357454e21f6d1c69f786a0e3795b4 | |
parent | 17ec25ba4e3c94534abe39fbca2f6e36cdc3be3a (diff) | |
download | FreeBSD-src-4d6a99d3a91e33384bec13b9ac7de8defe49a32a.zip FreeBSD-src-4d6a99d3a91e33384bec13b9ac7de8defe49a32a.tar.gz |
Add the GEOM_LABEL option to the BEAGLEBONE, GUMSTIX, and RPI-B
kernel configuration files, resolving an issue where the UFS and
MSDOSFS partitions would not mount as set in fstab(5).
This is a direct commit to stable/10, as the GEOM_LABEL option
is handled differently in head for arm/armv6. The WANDBOARD
and PANDABOARD already have this kernel option entry via the IMX6
kernel configuration file, so do not need to be changed.
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation
-rw-r--r-- | sys/arm/conf/BEAGLEBONE | 1 | ||||
-rw-r--r-- | sys/arm/conf/GUMSTIX | 1 | ||||
-rw-r--r-- | sys/arm/conf/RPI-B | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE index d6c9e65..3b05552 100644 --- a/sys/arm/conf/BEAGLEBONE +++ b/sys/arm/conf/BEAGLEBONE @@ -50,6 +50,7 @@ options TMPFS # Efficient memory filesystem options GEOM_PART_GPT # GUID Partition Tables options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme +options GEOM_LABEL # Provides labelization options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX index d430d8f..05ac4a3 100644 --- a/sys/arm/conf/GUMSTIX +++ b/sys/arm/conf/GUMSTIX @@ -49,6 +49,7 @@ options NFSCL # New Network Filesystem Client options NFS_ROOT # NFS usable as /, requires NFSCL options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme +options GEOM_LABEL # Provides labelization options TMPFS # Efficient memory filesystem #options MSDOSFS # MSDOS Filesystem #options CD9660 # ISO 9660 Filesystem diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B index ba00540..20379ed 100644 --- a/sys/arm/conf/RPI-B +++ b/sys/arm/conf/RPI-B @@ -45,6 +45,7 @@ options TMPFS # Efficient memory filesystem options GEOM_PART_GPT # GUID Partition Tables options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme +options GEOM_LABEL # Provides labelization options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support |