From 2e075349aa423b62af8dbb442421f4b3c98bfe70 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 4 Jul 2015 14:50:32 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@285132 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/arm/conf/BEAGLEBONE | 1 + sys/arm/conf/GUMSTIX | 1 + sys/arm/conf/RPI-B | 1 + 3 files changed, 3 insertions(+) diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE index d6c9e65da..3b055529f 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 d430d8f2a..05ac4a3d6 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 ba0054000..20379ed9c 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 -- 2.45.0