diff options
| author | Mark Johnston <markjdb@gmail.com> | 2019-03-13 17:33:39 -0400 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-03-14 07:32:15 +0100 |
| commit | 375815261dbedeaf0e02581d50be9980c9eef8b7 (patch) | |
| tree | d1c15e28c48322540911b33cbbfabfa6f3cf328d /pkg | |
| parent | ac5e611fde5e7f8c336be9f65b6145f54b041694 (diff) | |
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.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/freebsd.go | 3 |
1 files changed, 2 insertions, 1 deletions
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 |