diff options
| author |   jsg <jsg@openbsd.org> | 2015-06-08 17:35:43 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-06-08 17:35:43 +0000 |
| commit | 934919aa28e3ac6ca529bcfbc2d191fa9ebeca12 (patch) | |
| tree | c5b239183c4da6fe7b2c9f0f21be705a2fa2afc8 | |
| parent | Introduce a state on the ctl_relay_event struct. This makes it possible (diff) | |
| download | wireguard-openbsd-934919aa28e3ac6ca529bcfbc2d191fa9ebeca12.tar.xz wireguard-openbsd-934919aa28e3ac6ca529bcfbc2d191fa9ebeca12.zip | |
Move the scan_dmesg calls back into the functions. It can't be called
when the file is sourced as /var/run/dmesg.boot won't exist then.
| -rw-r--r-- | distrib/armv7/ramdisk/install.md | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/distrib/armv7/ramdisk/install.md b/distrib/armv7/ramdisk/install.md index 7bba69c6375..deebc1842e6 100644 --- a/distrib/armv7/ramdisk/install.md +++ b/distrib/armv7/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.13 2015/06/03 01:30:29 jsg Exp $ +# $OpenBSD: install.md,v 1.14 2015/06/08 17:35:43 jsg Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -50,11 +50,6 @@ if [[ $? == 0 ]]; then MDPLAT=SUNXI LOADADDR=0x40200000 fi -BEAGLE=$(scan_dmesg '/^omap0 at mainbus0: TI OMAP3 \(BeagleBoard\).*/s//\1/p') -BEAGLEBONE=$(scan_dmesg '/^omap0 at mainbus0: TI AM335x \(BeagleBone\).*/s//\1/p') -PANDA=$(scan_dmesg '/^omap0 at mainbus0: TI OMAP4 \(PandaBoard\)/s//\1/p') -CUBOX=$(scan_dmesg '/^imx0 at mainbus0: \(SolidRun.*\)/s//CUBOX/p') -NITROGEN=$(scan_dmesg '/^imx0 at mainbus0: \(Freescale i.MX6 SABRE Lite.*\)/s//NITROGEN/p') MDSETS="bsd.${MDPLAT}.umg bsd.rd.${MDPLAT}.umg" SANESETS="bsd" @@ -67,6 +62,12 @@ md_installboot() { local _disk=$1 mount /dev/${_disk}i /mnt/mnt + BEAGLE=$(scan_dmesg '/^omap0 at mainbus0: TI OMAP3 \(BeagleBoard\).*/s//\1/p') + BEAGLEBONE=$(scan_dmesg '/^omap0 at mainbus0: TI AM335x \(BeagleBone\).*/s//\1/p') + PANDA=$(scan_dmesg '/^omap0 at mainbus0: TI OMAP4 \(PandaBoard\)/s//\1/p') + CUBOX=$(scan_dmesg '/^imx0 at mainbus0: \(SolidRun.*\)/s//CUBOX/p') + NITROGEN=$(scan_dmesg '/^imx0 at mainbus0: \(Freescale i.MX6 SABRE Lite.*\)/s//NITROGEN/p') + if [[ -f /mnt/bsd.${MDPLAT}.umg ]]; then mv /mnt/bsd.${MDPLAT}.umg /mnt/mnt/bsd.umg fi @@ -124,6 +125,8 @@ md_prep_fdisk() { local bootfstype="msdos" local newfs_args=${NEWFSARGS_msdos} + CUBOX=$(scan_dmesg '/^imx0 at mainbus0: \(SolidRun.*\)/s//CUBOX/p') + # imx needs an ext2fs filesystem if [[ ${MDPLAT} == "IMX" ]]; then bootparttype="83" |