From owner-svn-src-all@freebsd.org Fri Jul 3 06:01:37 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA1929921C0; Fri, 3 Jul 2015 06:01:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB6AA1C98; Fri, 3 Jul 2015 06:01:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6361bvW084319; Fri, 3 Jul 2015 06:01:37 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6361bRS084318; Fri, 3 Jul 2015 06:01:37 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507030601.t6361bRS084318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 3 Jul 2015 06:01:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r285076 - head/release/tools X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2015 06:01:38 -0000 Author: gjb Date: Fri Jul 3 06:01:37 2015 New Revision: 285076 URL: https://svnweb.freebsd.org/changeset/base/285076 Log: Fix the real problem with missing UFS/MSDOSFS labels on the FreeBSD/arm builds. The problem stems from the loader.rc file not existing, as well as geom_label not being loaded at boot. For now, add the geom_label_load entry to loader.conf, and symlink loader.rc.sample to loader.rc, both of which allowed my BeagleBone Black to boot fine with a UFS label reference in fstab(5). MFC after: 3 days X-MFC-Before: 10.2-BETA1 Sponsored by: The FreeBSD Foundation Modified: head/release/tools/arm.subr Modified: head/release/tools/arm.subr ============================================================================== --- head/release/tools/arm.subr Fri Jul 3 05:47:56 2015 (r285075) +++ head/release/tools/arm.subr Fri Jul 3 06:01:37 2015 (r285076) @@ -140,6 +140,11 @@ arm_install_base() { echo 'sendmail_msp_queue_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf echo 'growfs_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + # The fstab(5) above uses UFS/MSDOSFS labels. + echo 'geom_label_load="YES"' >> ${CHROOTDIR}/boot/loader.conf + # Workaround missing loader.rc if needed. + chroot ${CHROOTDIR} ln -s /boot/loader.rc.sample /boot/loader.rc + sync umount_loop ${CHROOTDIR}/${DESTDIR}