From 199464dde3b7abdc412083e15a796aaf6d1381be Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 6 Mar 2022 15:49:51 -0500 Subject: [PATCH] Cleanup scripts --- ubuntu/scripts/cleanup.sh | 3 +++ ubuntu/scripts/hyperv.sh | 13 ------------- ubuntu/scripts/vmware.sh | 11 ----------- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 ubuntu/scripts/hyperv.sh delete mode 100644 ubuntu/scripts/vmware.sh diff --git a/ubuntu/scripts/cleanup.sh b/ubuntu/scripts/cleanup.sh index 035619c..e7395f8 100644 --- a/ubuntu/scripts/cleanup.sh +++ b/ubuntu/scripts/cleanup.sh @@ -58,6 +58,9 @@ echo "removing command-not-found-data" # 19.10+ don't have this package so fail gracefully apt-get -y purge command-not-found-data || true; +echo "remove unnecessary packages via snap/apt" +snap remove lxd + # Exclude the files we don't need w/o uninstalling linux-firmware echo "Setup dpkg excludes for linux-firmware" cat <<_EOF_ | cat >> /etc/dpkg/dpkg.cfg.d/excludes diff --git a/ubuntu/scripts/hyperv.sh b/ubuntu/scripts/hyperv.sh deleted file mode 100644 index 4543244..0000000 --- a/ubuntu/scripts/hyperv.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -eux -ubuntu_version="`lsb_release -r | awk '{print $2}'`"; -major_version="`echo $ubuntu_version | awk -F. '{print $1}'`"; - -case "$PACKER_BUILDER_TYPE" in -hyperv-iso) - echo "installing packaging for hyper-v" - if [ "$major_version" -eq "16" ]; then - apt-get install -y linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial; - else - apt-get -y install linux-image-virtual linux-tools-virtual linux-cloud-tools-virtual; - fi -esac diff --git a/ubuntu/scripts/vmware.sh b/ubuntu/scripts/vmware.sh deleted file mode 100644 index 1409a8b..0000000 --- a/ubuntu/scripts/vmware.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -eux - -case "$PACKER_BUILDER_TYPE" in -vmware-iso|vmware-vmx) - echo "install open-vm-tools" - apt-get install -y open-vm-tools; - mkdir /mnt/hgfs; - systemctl enable open-vm-tools - systemctl start open-vm-tools - echo "platform specific vmware.sh executed"; -esac