Since the armv7 installer now creates an msdos filesystem for the
bootloader, here's an updated installboot(8) diff. Besides FAT32 LBA
partitions (created by the installer), it also recognizes FAT16 LBA
and EFI System partitions. Not sure whether we actually need to
support FAT16, but we'll probably need EFI System partition support
for machines with real EFI firmware at some point.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/installboot/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 11 May 2016 21:52:51 -0000 1.16
+++ Makefile 31 May 2016 14:12:20 -0000
@@ -26,7 +26,7 @@ SRCS += stubs.c
.endif
.if ${MACHINE} == "armv7"
-SRCS += stubs.c
+SRCS += armv7_installboot.c
.endif
.if ${MACHINE} == "hppa"
Index: armv7_installboot.c
===================================================================
RCS file: armv7_installboot.c
diff -N armv7_installboot.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ armv7_installboot.c 31 May 2016 14:12:20 -0000
@@ -0,0 +1,266 @@
+/* $OpenBSD$ */
+/* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
+
+/*
+ * Copyright (c) 2011 Joel Sing <js...@openbsd.org>
+ * Copyright (c) 2010 Otto Moerbeek <o...@openbsd.org>
+ * Copyright (c) 2003 Tom Cosgrove <tom.cosgr...@arches-consulting.com>
+ * Copyright (c) 1997 Michael Shalayeff
+ * Copyright (c) 1994 Paul Kranenburg
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Paul Kranenburg.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/param.h> /* DEV_BSIZE */
+#include <sys/disklabel.h>
+#include <sys/dkio.h>
+#include <sys/ioctl.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include "installboot.h"
+
+static void write_efisystem(struct disklabel *, char);
+static int findmbrlinux(int, struct disklabel *);
+
+void
+md_init(void)
+{
+}
+
+void
+md_loadboot(void)
+{
+}
+
+void
+md_installboot(int devfd, char *dev)
+{
+ struct disklabel dl;
+ int part;
+
+ /* Get and check disklabel. */
+ if (ioctl(devfd, DIOCGDINFO, &dl) != 0)
+ err(1, "disklabel: %s", dev);
+ if (dl.d_magic != DISKMAGIC)
+ errx(1, "bad disklabel magic=0x%08x", dl.d_magic);
+
+ /* Warn on unknown disklabel types. */
+ if (dl.d_type == 0)
+ warnx("disklabel type unknown");
+
+ part = findmbrlinux(devfd, &dl);
+ if (part != -1) {
+ write_efisystem(&dl, (char)part);
+ return;
+ }
+}
+
+
+static void
+write_efisystem(struct disklabel *dl, char part)
+{
+ static char *fsckfmt = "/sbin/fsck_msdos %s >/dev/null";
+ static char *newfsfmt ="/sbin/newfs_msdos %s >/dev/null";
+ struct ufs_args args;
+ char cmd[60];
+ char dst[PATH_MAX];
+ char *src;
+ size_t mntlen, pathlen, srclen;
+ int rslt;
+
+ src = NULL;
+
+ /* Create directory for temporary mount point. */
+ strlcpy(dst, "/tmp/installboot.XXXXXXXXXX", sizeof(dst));
+ if (mkdtemp(dst) == NULL)
+ err(1, "mkdtemp('%s') failed", dst);
+ mntlen = strlen(dst);
+
+ /* Mount <duid>.<part> as msdos filesystem. */
+ memset(&args, 0, sizeof(args));
+ rslt = asprintf(&args.fspec,
+ "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx.%c",
+ dl->d_uid[0], dl->d_uid[1], dl->d_uid[2], dl->d_uid[3],
+ dl->d_uid[4], dl->d_uid[5], dl->d_uid[6], dl->d_uid[7],
+ part);
+ if (rslt == -1) {
+ warn("bad special device");
+ goto rmdir;
+ }
+
+ args.export_info.ex_root = -2;
+ args.export_info.ex_flags = 0;
+
+ if (mount(MOUNT_MSDOS, dst, 0, &args) == -1) {
+ /* Try fsck'ing it. */
+ rslt = snprintf(cmd, sizeof(cmd), fsckfmt, args.fspec);
+ if (rslt >= sizeof(cmd)) {
+ warnx("can't build for fsck command");
+ rslt = -1;
+ goto rmdir;
+ }
+ rslt = system(cmd);
+ if (rslt == -1) {
+ warn("system('%s') failed", cmd);
+ goto rmdir;
+ }
+ if (mount(MOUNT_MSDOS, dst, 0, &args) == -1) {
+ /* Try newfs'ing it. */
+ rslt = snprintf(cmd, sizeof(cmd), newfsfmt,
+ args.fspec);
+ if (rslt >= sizeof(cmd)) {
+ warnx("can't build newfs command");
+ rslt = -1;
+ goto rmdir;
+ }
+ rslt = system(cmd);
+ if (rslt == -1) {
+ warn("system('%s') failed", cmd);
+ goto rmdir;
+ }
+ rslt = mount(MOUNT_MSDOS, dst, 0, &args);
+ if (rslt == -1) {
+ warn("unable to mount EFI System partition");
+ goto rmdir;
+ }
+ }
+ }
+
+ /* Create "/efi/boot" directory in <duid>.<part>. */
+ if (strlcat(dst, "/efi", sizeof(dst)) >= sizeof(dst)) {
+ rslt = -1;
+ warn("unable to build /efi directory");
+ goto umount;
+ }
+ rslt = mkdir(dst, 0755);
+ if (rslt == -1 && errno != EEXIST) {
+ warn("mkdir('%s') failed", dst);
+ goto umount;
+ }
+ if (strlcat(dst, "/boot", sizeof(dst)) >= sizeof(dst)) {
+ rslt = -1;
+ warn("unable to build /boot directory");
+ goto umount;
+ }
+ rslt = mkdir(dst, 0755);
+ if (rslt == -1 && errno != EEXIST) {
+ warn("mkdir('%s') failed", dst);
+ goto umount;
+ }
+
+ /*
+ * Copy BOOTIARM.EFI to /efi/boot/bootarm.efi.
+ */
+ pathlen = strlen(dst);
+ if (strlcat(dst, "/bootarm.efi", sizeof(dst)) >= sizeof(dst)) {
+ rslt = -1;
+ warn("unable to build /bootarm.efi path");
+ goto umount;
+ }
+ src = fileprefix(root, "/usr/mdec/BOOTARM.EFI");
+ if (src == NULL) {
+ rslt = -1;
+ goto umount;
+ }
+ srclen = strlen(src);
+ if (verbose)
+ fprintf(stderr, "%s %s to %s\n",
+ (nowrite ? "would copy" : "copying"), src, dst);
+ if (!nowrite) {
+ rslt = filecopy(src, dst);
+ if (rslt == -1)
+ goto umount;
+ }
+
+ rslt = 0;
+
+umount:
+ dst[mntlen] = '\0';
+ if (unmount(dst, MNT_FORCE) == -1)
+ err(1, "unmount('%s') failed", dst);
+
+rmdir:
+ free(args.fspec);
+ dst[mntlen] = '\0';
+ if (rmdir(dst) == -1)
+ err(1, "rmdir('%s') failed", dst);
+
+ free(src);
+
+ if (rslt == -1)
+ exit(1);
+}
+
+int
+findmbrlinux(int devfd, struct disklabel *dl)
+{
+ struct dos_partition dp[NDOSPART];
+ ssize_t len;
+ u_int64_t start = 0;
+ int i;
+ u_int8_t *secbuf;
+
+ if ((secbuf = malloc(dl->d_secsize)) == NULL)
+ err(1, NULL);
+
+ /* Read MBR. */
+ len = pread(devfd, secbuf, dl->d_secsize, 0);
+ if (len != dl->d_secsize)
+ err(4, "can't read mbr");
+ memcpy(dp, &secbuf[DOSPARTOFF], sizeof(dp));
+
+ for (i = 0; i < NDOSPART; i++) {
+ if (dp[i].dp_typ == DOSPTYP_UNUSED)
+ continue;
+ if (dp[i].dp_typ == DOSPTYP_FAT16L ||
+ dp[i].dp_typ == DOSPTYP_FAT32L ||
+ dp[i].dp_typ == DOSPTYP_EFISYS)
+ start = dp[i].dp_start;
+ }
+
+ free(secbuf);
+
+ if (start) {
+ for (i = 0; i < MAXPARTITIONS; i++) {
+ if (DL_GETPSIZE(&dl->d_partitions[i]) > 0 &&
+ DL_GETPOFFSET(&dl->d_partitions[i]) == start)
+ return ('a' + i);
+ }
+ }
+
+ return (-1);
+}
