Compare commits

..

No commits in common. "ed10ea5bab390ff26291988002a01600387c6df3" and "a7330ce9e70bc116c77e52bb6f070e41d03619b5" have entirely different histories.

4 changed files with 1 additions and 7 deletions

View File

@ -68,7 +68,6 @@ Every default option ending with an `?` in "src/options.mk" can be overrided in
- `OPACK_GCE_PROJECT`: The Google Cloud project name where the VM will be created
- `OPACK_GCE_JSON_KEY`: The filename of the Google Cloud service account JSON key
- `OPACK_GCE_BUCKET`: The Google Cloud Storage bucket name to use for the image import
- 'OPACK_VAGRANT_NETWORK': Define additional networks
## Examples

View File

@ -111,7 +111,7 @@ $(OPACK_VAGRANT_FILE):
opack: $(OPACK_META_FILE) $(OPACK_VAGRANT_FILE)
ifndef OPACK_DEBUG
$(call spinner,vagrant up > /dev/null,█ $(shell date +'%H:%M:%S') Starting $(OPACK_BOX_TAG) with Vagrant)
$(call spinner,vagrant up > /dev/null,█ $(shell date +'%H:%M:%S') Starting $(OPACK_HOSTNAME)-$(OPACK_TARGET) with Vagrant)
else
vagrant up
endif

View File

@ -109,10 +109,6 @@ OPACK_AUTODISKLABEL_FILE?=$(OPACK_DIR)autodisklabel
# Define the Vagrantfile
OPACK_VAGRANT_FILE=Vagrantfile
# Define custom networks for Vagrant
OPACK_VAGRANT_NETWORK?=
#OPACK_VAGRANT_NETWORK=config.vm.network "private_network", auto_config: false
# Define the runtime provisioning script for Vagrant
OPACK_RUNTIME_PROVISION_FILE?=$(OPACK_DIR)vagrant-provision.sh

View File

@ -12,7 +12,6 @@ Vagrant.configure("2") do |config|
config.ssh.sudo_command = "doas env %c"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.provision "shell", path: "$(OPACK_RUNTIME_PROVISION_FILE)"
$(OPACK_VAGRANT_NETWORK)
config.vm.provider "libvirt" do |l|
l.cpus = $(OPACK_SYS_CPU)
l.memory = $(OPACK_SYS_MEMORY)