summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2016-05-22 08:01:05 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2016-05-22 08:01:05 +0000
commit6b057da7d4b6e7f5c05d7a43783451e64da24bec (patch)
treedd4a5bbd3e888d91fe9b26edae310c974cdecd23 /distrib
parent305595a0eb32e2d5260b8ce4a35db21bc1d09da1 (diff)
force long filenames on the initial fat16 mount here as well
dtb filenames are longer than 8.3
Diffstat (limited to 'distrib')
-rw-r--r--distrib/armv7/ramdisk/install.md12
1 files changed, 10 insertions, 2 deletions
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md
index 7598f00fe0d..79f36980121 100644
--- a/distrib/armv7/ramdisk/install.md
+++ b/distrib/armv7/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.29 2016/05/22 06:43:03 jsg Exp $
+# $OpenBSD: install.md,v 1.30 2016/05/22 08:01:04 jsg Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -61,10 +61,12 @@ DEFAULTSETS="bsd bsd.rd ${MDSETS}"
NEWFSARGS_msdos="-F 16 -L boot"
NEWFSARGS_ext2fs="-v boot"
+MOUNT_ARGS_msdos="-o-l"
+MOUNT_ARGS_ext2fs=
md_installboot() {
local _disk=$1
- mount /dev/${_disk}i /mnt/mnt
+ local mount_args=${MOUNT_ARGS_msdos}
BEAGLE=$(scan_dmesg '/^omap0 at mainbus0: TI OMAP3 \(BeagleBoard\).*/s//\1/p')
BEAGLEBONE=$(scan_dmesg '/^omap0 at mainbus0: TI AM335x \(BeagleBone\).*/s//\1/p')
@@ -73,6 +75,12 @@ md_installboot() {
NITROGEN=$(scan_dmesg '/^imx0 at mainbus0: \(Freescale i.MX6 SABRE Lite.*\)/s//NITROGEN/p')
WANDBOARD=$(scan_dmesg '/^imx0 at mainbus0: \(Wandboard i.MX6.*\)/s//WANDBOARD/p')
+ if [[ ${MDPLAT} == "IMX" && ! -n $WANDBOARD ]]; then
+ mount_args=${MOUNT_ARGS_ext2fs}
+ fi
+
+ mount ${mount_args} /dev/${_disk}i /mnt/mnt
+
if [[ -f /mnt/bsd.${MDPLAT}.umg ]]; then
mv /mnt/bsd.${MDPLAT}.umg /mnt/mnt/bsd.umg
fi