From 375815261dbedeaf0e02581d50be9980c9eef8b7 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markjdb@gmail.com>
Date: Wed, 13 Mar 2019 17:33:39 -0400
Subject: pkg/build: avoid hard-coding partition numbers in the freebsd build

Be marginally more general and mount the first UFS partition, whose
index may vary depending on whether a swap partition exists.
---
 pkg/build/freebsd.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/build/freebsd.go b/pkg/build/freebsd.go
index d398695af..dd69daa19 100644
--- a/pkg/build/freebsd.go
+++ b/pkg/build/freebsd.go
@@ -55,8 +55,9 @@ options 	KCOV
 	script := fmt.Sprintf(`
 set -eux
 md=$(sudo mdconfig -a -t vnode image)
+partn=$(gpart show /dev/${md} | awk '/freebsd-ufs/{print $3}' | head -n 1)
 tmpdir=$(mktemp -d)
-sudo mount /dev/${md}p3 $tmpdir
+sudo mount /dev/${md}p${partn} $tmpdir
 
 sudo MAKEOBJDIRPREFIX=%s make -C %s installkernel KERNCONF=SYZKALLER DESTDIR=$tmpdir
 
-- 
cgit mrf-deployment