diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-07-04 00:01:41 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-07-04 00:01:41 +0000 |
| commit | a1c0309edcf573d9a5999b70636b54e85ca4b984 (patch) | |
| tree | 20dd4f30942ab081bd1f0c2aa0ed1bf6182ed42b /release | |
| parent | 2a3508eb480c3a87129965e25ab921f94a76d6b6 (diff) | |
| download | src-a1c0309edcf573d9a5999b70636b54e85ca4b984.tar.gz src-a1c0309edcf573d9a5999b70636b54e85ca4b984.zip | |
Revert r285018, r285019, r285076, r285078, r285082.
The true cause of the missing UFS/MSDOSFS labels has been
identified, and only affects stable/10 at the moment.
An request for commit to stable/10 will be pending RE approval
after this commit.
MFC after: 1 day
X-MFC-Note: never
X-MFC-Never: r285018, r285019, r285076, r285078, r285082
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=285114
Diffstat (limited to 'release')
| -rw-r--r-- | release/tools/arm.subr | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 903aa33fd129..564d9b66b1db 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -128,14 +128,6 @@ 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}/${DESTDIR}/boot/loader.conf - # Workaround missing loader.rc if needed. - if [ ! -e "${CHROOTDIR}/${DESTDIR}/boot/loader.rc" ]; then - chroot ${CHROOTDIR} \ - ln -s /boot/loader.rc.sample ${DESTDIR}/boot/loader.rc - fi - sync umount_loop ${CHROOTDIR}/${DESTDIR} |