Skip to content

Commit 0a62832

Browse files
committed
fix(olss): 🐛 missing include in box Vagrantfile
Fixes oracle/vagrant-projects#528 Signed-off-by: Philippe Vanhaesendonck <philippe.vanhaesendonck@oracle.com>
1 parent 5f645ad commit 0a62832

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

oracle-linux-image-tools/cloud/vagrant-virtualbox/image-scripts.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,13 @@ cloud::image_package() {
129129
Vagrant::Config.run do |config|
130130
# This Vagrantfile is auto-generated to contain the MAC address of the box.
131131
# Custom configuration should be placed in the actual \`Vagrantfile\` in this box.
132-
config.vm.base_mac = "080027D25971"
132+
config.vm.base_mac = "080027$(openssl rand -hex 3 | tr '[:lower:]' '[:upper:]')"
133133
end
134+
135+
# Load include vagrant file if it exists after the auto-generated
136+
# so it can override any of the settings
137+
include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
138+
load include_vagrantfile if File.exist?(include_vagrantfile)
134139
EOF
135140

136141
if [[ "${ORACLE_RELEASE}" =~ ^[89]$ ]]; then

0 commit comments

Comments
 (0)