Revert r285018 and r285019, which attempted to resolve
UFS/MSDOSFS label issues on FreeBSD/arm builds, however the real problem was addressed in r285076, which is due to two separate issues, unrelated to md(4) stale device existence. MFC after: 3 days X-MFC-With: r285076 X-MFC-Before: 10.2-BETA1 Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
8c2676b7e0
commit
f1db22bf1a
@ -63,18 +63,6 @@ umount_loop() {
|
||||
}
|
||||
|
||||
arm_create_disk() {
|
||||
# XXX: This is potentially dangerous, but works around an issue
|
||||
# properly labeling md(4) devices when the label already
|
||||
# exists.
|
||||
# EVERYTHINGISFINE should *never* be set for non-RE use.
|
||||
# Trust me. I'm an engineer.
|
||||
if [ ! -z "${EVERYTHINGISFINE}" ]; then
|
||||
for _label in ufs/rootfs msdosfs/MSDOSBOOT; do
|
||||
if [ -e "/dev/${_label}" ]; then
|
||||
rm /dev/${_label}
|
||||
fi
|
||||
done
|
||||
fi
|
||||
# Create the target raw file and temporary work directory.
|
||||
chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev}
|
||||
chroot ${CHROOTDIR} gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev}
|
||||
|
Loading…
Reference in New Issue
Block a user