From owner-svn-src-head@freebsd.org Fri Dec 15 06:34:30 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 006CEE9D09D; Fri, 15 Dec 2017 06:34:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9BF2669EFE; Fri, 15 Dec 2017 06:34:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBF6YRZs023998; Fri, 15 Dec 2017 06:34:27 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBF6YRGc023997; Fri, 15 Dec 2017 06:34:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201712150634.vBF6YRGc023997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 15 Dec 2017 06:34:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326874 - head/tools/boot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/tools/boot X-SVN-Commit-Revision: 326874 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Dec 2017 06:34:30 -0000 Author: imp Date: Fri Dec 15 06:34:27 2017 New Revision: 326874 URL: https://svnweb.freebsd.org/changeset/base/326874 Log: Script to generate minimal boot images for each of the 24 supported boot images for x86. This will be enhanced to generate all the other images (u-boot, powerpc CHRP, etc). At the moment, it's only generating three of them. zfs+gpt+legacy works with qemu: qemu-system-x86_64 --drive file=${file},format=raw -serial telnet::4444,server but the ufs ones still have issues I'm tracking down. These images are the boot blocks, /boot/loader, a kernel, maybe a couple of modules, /sbin/init, /bin/sh, /libexec/ld-elf.so, libc.so, libedit and libncursesw. This is just enough to get to single user. At the moment, these come from the host system, but should come from OBJTOP. At the moment, this requires root to build since the zfs tools require it (and GELI will too when we add support for that). Sponsored by: Netflix Added: head/tools/boot/rootgen.sh (contents, props changed) Added: head/tools/boot/rootgen.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/boot/rootgen.sh Fri Dec 15 06:34:27 2017 (r326874) @@ -0,0 +1,213 @@ +#!/bin/sh + +# $FreeBSD$ + +# +# Builds all the bat-shit crazy combinations we support booting from, +# at least for amd64. It assume you have a ~sane kernel in /boot/kernel +# and copies that into the ~150MB root images we create (we create the du +# size of the kernel + 20MB +# +# Sad panda sez: this runs as root, but could be userland if someone +# creates userland geli and zfs tools. +# +# This assumes an external prograam install-boot.sh which will install +# the appropriate boot files in the appropriate locations. +# +# These images assume ada0 will be the root image. We should likely +# use labels, but we don't. +# +# ASsumes you've already rebuilt... maybe bad? Also maybe bad: the env +# vars should likely be conditionally set to allow better automation. +# + +cpsys() { + src=$1 + dst=$2 + + # Copy kernel + boot loader + (cd $src ; tar cf - .) | (cd $dst; tar xf -) +} + +mk_nogeli_gpt_ufs_legacy() { + src=$1 + img=$2 + + rm -f ${img} ${img}.p2 + makefs -t ffs -B little -s 200m ${img}.p2 ${src} + mkimg -s gpt -b ${src}/boot/pmbr \ + -p freebsd-boot:=${src}/boot/gptboot \ + -p freebsd-ufs:=${img}.p2 -o ${img} +} + +mk_nogeli_gpt_ufs_uefi() { + src=$1 + img=$2 + + rm -f ${img} ${img}.p2 + makefs -t ffs -B little -s 200m ${img}.p2 ${src} + mkimg -s gpt -b ${src}/boot/pmbr \ + -p freebsd-boot:=${src}/boot/gptboot \ + -p freebsd-ufs:=${img}.p2 -o ${img} +} + +mk_nogeli_gpt_ufs_both() { + src=$1 + img=$2 + + makefs -t ffs -B little -s 200m ${img}.p3 ${src} + # p1 is boot for uefi, p2 is boot for gpt, p3 is / + mkimg -b ${src}/boot/pmbr -s gpt \ + -p efi:=${src}/boot/boot1.efifat \ + -p freebsd-boot:=${src}/boot/gptboot \ + -p freebsd-ufs:=${img}.p3 \ + -o ${img} +} + +mk_nogeli_gpt_zfs_legacy() { + src=$1 + img=$2 + mntpt=$3 + geli=$4 + scheme=$5 + fs=$6 + bios=$7 + pool=nogeli-gpt-zfs-legacy + + rm -f ${img} + dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512)) + md=$(mdconfig -f ${img}) + gpart create -s gpt ${md} + gpart add -t freebsd-boot -s 400k -a 4k ${md} # <= ~540k + gpart add -t freebsd-zfs -l root $md + # install-boot will make this bootable + zpool create -O mountpoint=none -R ${mntpt} ${pool} ${md}p2 + zpool set bootfs=${pool} ${pool} + zfs create -o mountpoint=/ ${pool}/ROOT + # NB: The online guides go nuts customizing /var and other mountpoints here, no need + cpsys ${src} ${mntpt} + df + # need to make a couple of tweaks + cat > ${mntpt}/boot/loader.conf < ${DESTDIR}/boot.config +# XXX +cp /boot/device.hints ${DESTDIR}/boot/device.hints +# Assume we're already built +make install DESTDIR=${DESTDIR} MK_MAN=no MK_INSTALL_AS_USER=yes +# Copy init, /bin/sh and minimal libraries +mkdir -p ${DESTDIR}/sbin ${DESTDIR}/bin ${DESTDIR}/lib ${DESTDIR}/libexec +for f in /sbin/init /bin/sh $(ldd /bin/sh | awk 'NF == 4 { print $3; }') /libexec/ld-elf.so.1; do + cp $f ${DESTDIR}/$f +done +mkdir ${DESTDIR}/dev + +# OK. Let the games begin + +for geli in nogeli geli; do + for scheme in gpt mbr; do + for fs in ufs zfs; do + for bios in legacy uefi both; do + # Create sparse file and mount newly created filesystem(s) on it + img=${IMGDIR}/${geli}-${scheme}-${fs}-${bios}.img + echo "vvvvvvvvvvvvvvvvvvvvvv Creating $img vvvvvvvvvvvvvvvvvvvvvvv" + eval mk_${geli}_${scheme}_${fs}_${bios} ${DESTDIR} ${img} ${MNTPT} ${geli} ${scheme} ${fs} ${bios} + echo "^^^^^^^^^^^^^^^^^^^^^^ Creating $img ^^^^^^^^^^^^^^^^^^^^^^^" + done + done + done +done + +rmdir ${MNTPT}