diff --git a/src/opack.mk b/src/opack.mk index ffb2914..d3a3072 100644 --- a/src/opack.mk +++ b/src/opack.mk @@ -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_HOSTNAME)-$(OPACK_TARGET) with Vagrant) + $(call spinner,vagrant up > /dev/null,█ $(shell date +'%H:%M:%S') Starting $(OPACK_BOX_TAG) with Vagrant) else vagrant up endif diff --git a/src/options.mk b/src/options.mk index c21c0e2..e3a3fa0 100644 --- a/src/options.mk +++ b/src/options.mk @@ -109,6 +109,10 @@ 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 diff --git a/src/vagrantfile.mk b/src/vagrantfile.mk index 974dbc9..0cd3a07 100644 --- a/src/vagrantfile.mk +++ b/src/vagrantfile.mk @@ -12,6 +12,7 @@ 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)