Date: Fri, 12 Mar 2021 16:46:49 GMT From: Brad Davis <brd@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 81c6dfbf5608 - main - release: Move the vagrant.vmx config out to its own file to match vbox Message-ID: <202103121646.12CGknFp086545@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=81c6dfbf5608caebb22ded98beb8527099c8d918 commit 81c6dfbf5608caebb22ded98beb8527099c8d918 Author: Brad Davis <brd@FreeBSD.org> AuthorDate: 2021-01-26 17:02:57 +0000 Commit: Brad Davis <brd@FreeBSD.org> CommitDate: 2021-03-12 16:44:42 +0000 release: Move the vagrant.vmx config out to its own file to match vbox Silly to have all these echos and makes this easier to use in other tooling. Reviewed by: gjb (re) --- release/Makefile.vagrant | 34 ++-------------------------------- release/scripts/vagrant.vmx | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index d49eedacb6c9..afbef8f2f3bf 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -101,37 +101,7 @@ vagrant-create-virtualbox-metadata: virtualbox/box.ovf virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf cp ${.ALLSRC} virtualbox/ -vmware/vagrant.vmx: - @(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx) - @(cd vmware && echo 'bios.bootorder = "hdd,CDROM"' >> vagrant.vmx) - @(cd vmware && echo 'checkpoint.vmstate = ""' >> vagrant.vmx) - @(cd vmware && echo 'cleanshutdown = "TRUE"' >> vagrant.vmx) - @(cd vmware && echo 'config.version = "8"' >> vagrant.vmx) - @(cd vmware && echo 'displayname = "${VAGRANT_TARGET}"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.addresstype = "generated"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.bsdname = "en0"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.connectiontype = "nat"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.displayname = "Ethernet"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.linkstatepropagation.enable = "FALSE"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.pcislotnumber = "33"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.present = "TRUE"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.virtualdev = "e1000"' >> vagrant.vmx) - @(cd vmware && echo 'ethernet0.wakeonpcktrcv = "FALSE"' >> vagrant.vmx) - @(cd vmware && echo 'floppy0.present = "FALSE"' >> vagrant.vmx) - @(cd vmware && echo 'guestos = "freebsd-64"' >> vagrant.vmx) - @(cd vmware && echo 'gui.fullscreenatpoweron = "FALSE"' >> vagrant.vmx) - @(cd vmware && echo 'gui.viewmodeatpoweron = "windowed"' >> vagrant.vmx) - @(cd vmware && echo 'memsize = "512"' >> vagrant.vmx) - @(cd vmware && echo 'sound.startconnected = "FALSE"' >> vagrant.vmx) - @(cd vmware && echo 'softpoweroff = "TRUE"' >> vagrant.vmx) - @(cd vmware && echo 'scsi0.pcislotnumber = "16"' >> vagrant.vmx) - @(cd vmware && echo 'scsi0.present = "TRUE"' >> vagrant.vmx) - @(cd vmware && echo 'scsi0.virtualdev = "lsilogic"' >> vagrant.vmx) - @(cd vmware && echo 'scsi0:0.filename = "vagrant.vmdk"' >> vagrant.vmx) - @(cd vmware && echo 'scsi0:0.present = "TRUE"' >> vagrant.vmx) - @(cd vmware && echo 'tools.synctime = "TRUE"' >> vagrant.vmx) - @(cd vmware && echo 'usb.present = "FALSE"' >> vagrant.vmx) - @(cd vmware && echo 'virtualhw.productcompatibility = "hosted"' >> vagrant.vmx) - @(cd vmware && echo 'virtualhw.version = "9"' >> vagrant.vmx) +vmware/vagrant.vmx: ${.CURDIR}/scripts/vagrant.vmx + cp ${.ALLSRC} vmware/ vagrant-create-vmware-metadata: vmware/vagrant.vmx diff --git a/release/scripts/vagrant.vmx b/release/scripts/vagrant.vmx new file mode 100644 index 000000000000..3d4a77584832 --- /dev/null +++ b/release/scripts/vagrant.vmx @@ -0,0 +1,31 @@ +.encoding = "UTF-8" +bios.bootorder = "hdd,CDROM" +checkpoint.vmstate = "" +cleanshutdown = "TRUE" +config.version = "8" +displayname = "${VAGRANT_TARGET}" +ethernet0.addresstype = "generated" +ethernet0.bsdname = "en0" +ethernet0.connectiontype = "nat" +ethernet0.displayname = "Ethernet" +ethernet0.linkstatepropagation.enable = "FALSE" +ethernet0.pcislotnumber = "33" +ethernet0.present = "TRUE" +ethernet0.virtualdev = "e1000" +ethernet0.wakeonpcktrcv = "FALSE" +floppy0.present = "FALSE" +guestos = "freebsd-64" +gui.fullscreenatpoweron = "FALSE" +gui.viewmodeatpoweron = "windowed" +memsize = "512" +sound.startconnected = "FALSE" +softpoweroff = "TRUE" +scsi0.pcislotnumber = "16" +scsi0.present = "TRUE" +scsi0.virtualdev = "lsilogic" +scsi0:0.filename = "vagrant.vmdk" +scsi0:0.present = "TRUE" +tools.synctime = "TRUE" +usb.present = "FALSE" +virtualhw.productcompatibility = "hosted" +virtualhw.version = "9"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103121646.12CGknFp086545>