Refactor image cleaning part

.github/workflows/packer-templates.yml

@@ -19,6 +19,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+
       - name: Download Packer
         run: |
           PACKER_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | jq -r -M '.current_version')

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "ansible/roles/ansible-role-my_common_defaults"]
 	path = ansible/roles/ansible-role-my_common_defaults
 	url = https://github.com/ruzickap/ansible-role-my_common_defaults.git
+[submodule "scripts/linux-common/packer-virt-sysprep"]
+	path = scripts/linux-common/packer-virt-sysprep
+	url = https://github.com/ruzickap/packer-virt-sysprep.git

my_centos-7.json

@@ -93,7 +93,7 @@
   "provisioners": [
     {
       "type": "shell",
-      "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E bash -x '{{ .Path }}'",
+      "execute_command": "echo 'vagrant' | sudo -S -E bash '{{ .Path }}'",
       "scripts": [
         "scripts/linux-common/vagrant.sh"
       ]
@@ -114,9 +114,20 @@
     },
     {
       "type": "shell",
-      "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E bash -x '{{ .Path }}'",
+      "execute_command": "sudo -E bash '{{ .Path }}'",
       "scripts": [
-        "scripts/linux-common/cleanup.sh"
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-dhcp-client-state.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-firewall-rules.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-logfiles.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-machine-id.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-mail-spool.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-network.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-package-manager-cache.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-rpm-db.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-ssh-hostkeys.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-tmp-files.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-yum-uuid.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-disk-space.sh"
       ]
     }
   ],

my_ubuntu-server.json

@@ -102,13 +102,13 @@
   "provisioners": [
     {
       "type": "shell",
-      "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E bash -x '{{ .Path }}'",
+      "execute_command": "echo 'vagrant' | sudo -S -E bash '{{ .Path }}'",
       "scripts": [
+        "scripts/linux-common/vagrant.sh",
         "scripts/ubuntu/update.sh",
         "scripts/ubuntu/add_libpam-systemd.sh",
         "scripts/ubuntu/disable_apt-daily.sh",
-        "scripts/ubuntu/virtualbox-guest.sh",
-        "scripts/linux-common/vagrant.sh"
+        "scripts/ubuntu/virtualbox-guest.sh"
       ]
     },
     {
@@ -135,9 +135,15 @@
     },
     {
       "type": "shell",
-      "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E bash -x '{{ .Path }}'",
+      "execute_command": "sudo -E bash '{{ .Path }}'",
       "scripts": [
-        "scripts/linux-common/cleanup.sh"
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-dhcp-client-state.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-logfiles.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-machine-id.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-package-manager-cache.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-ssh-hostkeys.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-tmp-files.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-disk-space.sh"
       ]
     }
   ],

scripts/ubuntu/add_libpam-systemd.sh

@@ -6,4 +6,4 @@
 # Description: https://serverfault.com/questions/706475/ssh-sessions-hang-on-shutdown-reboot
 
 export DEBIAN_FRONTEND="noninteractive"
-apt-get install -qq -y --no-install-recommends libpam-systemd
+apt-get install -qq -y --no-install-recommends libpam-systemd > /dev/null

scripts/ubuntu/disable-netplan-networkd.sh

@@ -8,5 +8,5 @@
 # In short the /etc/netplan/01-netcfg.yaml should not be on the Ubuntu Desktop installation when using Vagrant otherwise `vagrant up` is hanging.
 
 if [[ -s /etc/netplan/01-netcfg.yaml ]] ; then
-  rm -v /etc/netplan/01-netcfg.yaml
+  rm /etc/netplan/01-netcfg.yaml
 fi

scripts/ubuntu/disable_apt-daily.sh

@@ -2,8 +2,6 @@
 
 # Issue: https://github.com/boxcutter/ubuntu/pull/74
 
-echo "Disabling unattended upgrades"
-
 cat > /etc/apt/apt.conf.d/51disable-unattended-upgrades << EOF
 APT::Periodic::Update-Package-Lists "0";
 APT::Periodic::Unattended-Upgrade "0";

scripts/ubuntu/spice-vdagent.sh

@@ -4,5 +4,5 @@ if grep -q QEMU /proc/scsi/scsi; then
   echo "*** Installing spice-vdagent"
 
   export DEBIAN_FRONTEND="noninteractive"
-  apt-get install -y -qq --no-install-recommends spice-vdagent
+  apt-get install -y -qq --no-install-recommends spice-vdagent > /dev/null
 fi

ubuntu-desktop.json

@@ -104,15 +104,21 @@
   "provisioners": [
     {
       "type": "shell",
-      "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E bash -x '{{ .Path }}'",
+      "execute_command": "echo 'vagrant' | sudo -S -E bash '{{ .Path }}'",
       "scripts": [
+        "scripts/linux-common/vagrant.sh",
         "scripts/ubuntu/update.sh",
         "scripts/ubuntu/disable_apt-daily.sh",
         "scripts/ubuntu/spice-vdagent.sh",
         "scripts/ubuntu/virtualbox-guest-x11.sh",
         "scripts/ubuntu/disable-netplan-networkd.sh",
-        "scripts/linux-common/vagrant.sh",
-        "scripts/linux-common/cleanup.sh"
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-dhcp-client-state.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-logfiles.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-machine-id.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-package-manager-cache.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-ssh-hostkeys.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-tmp-files.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-disk-space.sh"
       ]
     }
   ],

ubuntu-server.json

@@ -103,14 +103,20 @@
   "provisioners": [
     {
       "type": "shell",
-      "execute_command": "echo 'vagrant' | {{ .Vars }} sudo -S -E bash -x '{{ .Path }}'",
+      "execute_command": "echo 'vagrant' | sudo -S -E bash '{{ .Path }}'",
       "scripts": [
+        "scripts/linux-common/vagrant.sh",
         "scripts/ubuntu/update.sh",
         "scripts/ubuntu/add_libpam-systemd.sh",
         "scripts/ubuntu/disable_apt-daily.sh",
         "scripts/ubuntu/virtualbox-guest.sh",
-        "scripts/linux-common/vagrant.sh",
-        "scripts/linux-common/cleanup.sh"
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-dhcp-client-state.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-logfiles.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-machine-id.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-package-manager-cache.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-ssh-hostkeys.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-tmp-files.sh",
+        "scripts/linux-common/packer-virt-sysprep/sysprep-op-disk-space.sh"
       ]
     }
   ],