diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-05-03 19:30:11 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-05-03 19:30:11 +0000 |
commit | 7757a1b4dc60696d9a95137ee0a2accd4ee680f4 (patch) | |
tree | 43730ad7995cdbd70d25f4f9739ec3b2abd10b91 /release/scripts/mk-vmimage.sh | |
parent | 3a161d956bb0dee5baf944a5acd53f08d2c9712a (diff) | |
parent | 9dba9460d9a26bdb9122e4a1cad9d689b0940748 (diff) | |
download | src-7757a1b4dc60696d9a95137ee0a2accd4ee680f4.tar.gz src-7757a1b4dc60696d9a95137ee0a2accd4ee680f4.zip |
Merge from head
Notes
Notes:
svn path=/projects/release-pkg/; revision=282368
Diffstat (limited to 'release/scripts/mk-vmimage.sh')
-rwxr-xr-x | release/scripts/mk-vmimage.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index d5985ceb0d25..fd84216a99fe 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -93,6 +93,16 @@ main() { . "${VMCONFIG}" fi + case ${TARGET}:${TARGET_ARCH} in + arm64:aarch64) + ROOTLABEL="ufs" + NOSWAP=1 + ;; + *) + ROOTLABEL="gpt" + ;; + esac + vm_create_base vm_install_base vm_extra_install_base |