Merge branch 'main' of https://github.com/chef/bento

Author: mmguero

.github/workflows/pkr-bld-amazonlinux-arm64.yml

@@ -26,8 +26,6 @@ jobs:
           brew install --cask virtualbox
       - name: Install Chef
         uses: actionshub/chef-install@3.0.0
-        with:
-          version: 24.2.1058
       - name: Setup Packer
         uses: hashicorp/setup-packer@main
         with:

.github/workflows/pkr-bld-amazonlinux-x64.yml

@@ -27,8 +27,6 @@ jobs:
           vagrant --version
       - name: Install Chef
         uses: actionshub/chef-install@3.0.0
-        with:
-          version: 24.2.1058
       - name: Setup Packer
         uses: hashicorp/setup-packer@main
         with:

.github/workflows/pkr-bld-hyperv-x64.yml

@@ -40,8 +40,6 @@ jobs:
         uses: actions/checkout@main
       - name: Install Chef
         uses: actionshub/chef-install@3.0.0
-        with:
-          version: 24.2.1058
       - name: Setup Packer
         uses: hashicorp/setup-packer@main
         with:

.github/workflows/pkr-bld-qemu-x64.yml

@@ -57,8 +57,6 @@ jobs:
           sudo systemctl status libvirtd
       - name: Install Chef
         uses: actionshub/chef-install@3.0.0
-        with:
-          version: 24.2.1058
       - name: Setup Packer
         uses: hashicorp/setup-packer@main
         with:

.github/workflows/pkr-bld-virtualbox-x64.yml

@@ -48,8 +48,6 @@ jobs:
           sudo apt-get install -y software-properties-common vagrant virtualbox-7.1
       - name: Install Chef
         uses: actionshub/chef-install@3.0.0
-        with:
-          version: 24.2.1058
       - name: Setup Packer
         uses: hashicorp/setup-packer@main
         with:

.github/workflows/test-pkr-bld-parallels.yml

@@ -46,8 +46,6 @@ jobs:
           vagrant plugin install vagrant-parallels
       - name: Install Chef
         uses: actionshub/chef-install@3.0.0
-        with:
-          version: 24.2.1058
       - name: Setup Packer
         uses: hashicorp/setup-packer@main
         with:

os_pkrvars/macos/macos-15-aarch64.pkrvars.hcl

@@ -14,7 +14,7 @@ boot_command = [
   # Select Your Country and Region
   "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait10s>",
   # Transfer your data to this Mac
-  "<tab><wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait5s>",
+  "<tab><wait><tab><wait><tab><wait><tab><wait><spacebar><wait><tab><wait><tab><wait><spacebar><wait5s>",
   # Written and Spoken Languages
   "<leftShiftOn><tab><leftShiftOff><wait><spacebar><wait5s>",
   # Accessibility

packer_templates/scripts/_common/build_tools.sh

@@ -40,9 +40,10 @@ virtualbox-iso|virtualbox-ovf)
   ;;
 *)
   echo "Unknown Packer Builder Type >>$PACKER_BUILDER_TYPE<< selected."
+  exit 0
   ;;
 esac
 
 echo "build tools installed rebooting"
-reboot
+shutdown -r now
 sleep 60

packer_templates/scripts/_common/guest_tools_parallels.sh

@@ -1,8 +1,12 @@
 #!/bin/sh -eux
 
 # set a default HOME_DIR environment variable if not set
-HOME_DIR="${HOME_DIR:-/home/vagrant}"
 OS_NAME=$(uname -s)
+if [ "$OS_NAME" = "Darwin" ]; then
+  HOME_DIR="/Users/vagrant"
+else
+  HOME_DIR="${HOME_DIR:-/home/vagrant}"
+fi
 
 case "$PACKER_BUILDER_TYPE" in
 parallels-iso|parallels-pvm|parallels-ipsw)
@@ -12,7 +16,7 @@ parallels-iso|parallels-pvm|parallels-ipsw)
   elif [ "$OS_NAME" = "Darwin" ]; then
     installer -pkg /Volumes/Parallels\ Tools/Install.app/Contents/Resources/Install.mpkg -target /
     # This usually works but gives a failed to eject error
-    hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed";
+    hdiutil detach /Volumes/Parallels\ Tools || echo "exit code $? is suppressed"
   elif ! ([ "$(uname -m)" = "aarch64" ] && [ -f /etc/os-release ] && (grep -qi 'opensuse' /etc/os-release || grep -qi 'sles' /etc/os-release)); then
     mkdir -p /tmp/parallels;
     if [ "$(uname -m)" = "aarch64" ] ; then
@@ -35,10 +39,12 @@ parallels-iso|parallels-pvm|parallels-ipsw)
     if command -v dnf >/dev/null 2>&1; then
       dnf remove -y install checkpolicy selinux-policy-devel gcc kernel-devel kernel-headers make
     fi
-    reboot
+    shutdown -r now
     sleep 60
   else
     echo "Skipping Parallels Tools installation on aarch64 architecture for opensuse and derivatives"
   fi
+  shutdown -r now
+  sleep 60
   ;;
 esac

packer_templates/scripts/_common/guest_tools_virtualbox.sh

@@ -1,8 +1,12 @@
 #!/bin/sh -eux
 
 # set a default HOME_DIR environment variable if not set
-HOME_DIR="${HOME_DIR:-/home/vagrant}"
 OS_NAME=$(uname -s)
+if [ "$OS_NAME" = "Darwin" ]; then
+  HOME_DIR="/Users/vagrant"
+else
+  HOME_DIR="${HOME_DIR:-/home/vagrant}"
+fi
 
 case "$PACKER_BUILDER_TYPE" in
 virtualbox-iso|virtualbox-ovf)
@@ -32,7 +36,7 @@ virtualbox-iso|virtualbox-ovf)
       echo 'ifconfig_vtnet3_name="em3"'
     } >> /etc/rc.conf
     pw groupadd vboxusers;
-    pw groupmod vboxusers -m vagrant;
+    pw groupmod vboxusers -m vagrant
   elif [ "$OS_NAME" = "Darwin" ]; then
     echo "Nothing to do for $OS_NAME"
     exit 0
@@ -83,10 +87,10 @@ virtualbox-iso|virtualbox-ovf)
 
     echo "removing leftover logs"
     rm -rf /var/log/vboxadd*
-    reboot
-    sleep 60
   else
     echo "Skipping Virtualbox guest additions installation on aarch64 architecture for opensuse and derivatives"
   fi
+  shutdown -r now
+  sleep 60
   ;;
 esac