From 8adb2977d05d935f563b88ce23dbe2a621a42749 Mon Sep 17 00:00:00 2001 From: Jan Orel Date: Tue, 21 Jan 2025 14:28:37 +0100 Subject: [PATCH] M #-: Remove open-vm-tools --- appliances/VRouter/Failover/main.rb | 7 ------- context-linux/targets.sh | 24 ++++++++++++------------ packer/alma/80-install-context.sh.8 | 2 +- packer/alma/80-install-context.sh.9 | 2 +- packer/alpine/80-install-context.sh | 3 +-- packer/alt/80-install-context.sh | 2 +- packer/amazon/80-install-context.sh.2 | 2 +- packer/amazon/80-install-context.sh.2023 | 2 +- packer/debian/80-install-context.sh.11 | 2 +- packer/debian/80-install-context.sh.12 | 2 +- packer/devuan/80-install-context.sh | 2 -- packer/fedora/80-install-context.sh | 2 +- packer/freebsd/script.sh | 2 +- packer/ol/80-install-context.sh.8 | 2 +- packer/ol/80-install-context.sh.9 | 2 +- packer/opensuse/80-install-context.sh | 2 +- packer/rhel/80-install-context.sh.8 | 2 +- packer/rhel/80-install-context.sh.9 | 2 +- packer/rocky/80-install-context.sh.8 | 2 +- packer/rocky/80-install-context.sh.9 | 2 +- packer/ubuntu/80-install-context.sh | 2 +- 21 files changed, 30 insertions(+), 40 deletions(-) diff --git a/appliances/VRouter/Failover/main.rb b/appliances/VRouter/Failover/main.rb index cab214d4..5c584789 100644 --- a/appliances/VRouter/Failover/main.rb +++ b/appliances/VRouter/Failover/main.rb @@ -38,13 +38,6 @@ def install(initdir: '/etc/init.d') def configure msg :info, 'Failover::configure' - puts bash <<~SCRIPT - if [[ "$(virt-what)" != vmware ]]; then - rc-update del open-vm-tools default && rc-update -u ||: - rc-service open-vm-tools stop ||: - fi - SCRIPT - toggle [:enable, :start] end diff --git a/context-linux/targets.sh b/context-linux/targets.sh index c7d7db38..9f71c78a 100644 --- a/context-linux/targets.sh +++ b/context-linux/targets.sh @@ -22,7 +22,7 @@ case "${TARGET}" in TYPE=${TYPE:-freebsd} EXT=${EXT:-txz} TAGS=${TAGS:-bsd bsd_rc one sysv crond} - DEPENDS=${DEPENDS:-sudo bash curl base64 ruby open-vm-tools-nox11 gawk virt-what} + DEPENDS=${DEPENDS:-sudo bash curl base64 ruby gawk virt-what} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-addon-context} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -38,7 +38,7 @@ case "${TARGET}" in TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one network-scripts} DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server qemu-guest-agent network-scripts gawk virt-what} - RECOMMENDS=${RECOMMENDS:-open-vm-tools} + RECOMMENDS=${RECOMMENDS:-} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -54,7 +54,7 @@ case "${TARGET}" in TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one} DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server qemu-guest-agent gawk virt-what} - RECOMMENDS=${RECOMMENDS:-open-vm-tools} + RECOMMENDS=${RECOMMENDS:-} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -70,7 +70,7 @@ case "${TARGET}" in TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one} DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server qemu-guest-agent gawk virt-what} - RECOMMENDS=${RECOMMENDS:-open-vm-tools} + RECOMMENDS=${RECOMMENDS:-} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -86,7 +86,7 @@ case "${TARGET}" in TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one} DEPENDS=${DEPENDS:-util-linux bash curl bind-utils btrfs-progs cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server qemu-guest-agent gawk virt-what} - RECOMMENDS=${RECOMMENDS:-open-vm-tools} + RECOMMENDS=${RECOMMENDS:-} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -102,7 +102,7 @@ case "${TARGET}" in TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one network-scripts} DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted qemu-guest-agent ruby rubygem-json sudo shadow-utils openssh-server gawk virt-what} - RECOMMENDS=${RECOMMENDS:-open-vm-tools} + RECOMMENDS=${RECOMMENDS:-} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -118,7 +118,7 @@ case "${TARGET}" in TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one network-scripts} DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server network-scripts gawk virt-what} - RECOMMENDS=${RECOMMENDS:-open-vm-tools} + RECOMMENDS=${RECOMMENDS:-} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init cloud-init-cfg-onprem} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -134,7 +134,7 @@ case "${TARGET}" in RELSUFFIX=${RELSUFFIX:-alt} TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one networkd} - DEPENDS=${DEPENDS:-bind-utils btrfs-progs cloud-utils-growpart curl e2fsprogs iproute2 openssl parted passwd qemu-guest-agent open-vm-tools ruby-json-pure sudo systemd-services wget which xfsprogs gawk virt-what} + DEPENDS=${DEPENDS:-bind-utils btrfs-progs cloud-utils-growpart curl e2fsprogs iproute2 openssl parted passwd qemu-guest-agent ruby-json-pure sudo systemd-services wget which xfsprogs gawk virt-what} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -150,7 +150,7 @@ case "${TARGET}" in RELSUFFIX=${RELSUFFIX:-.suse} TYPE=${TYPE:-rpm} TAGS=${TAGS:-linux rpm systemd one network-scripts} - DEPENDS=${DEPENDS:-util-linux bash curl bind-utils growpart parted parted ruby sudo shadow openssh open-vm-tools qemu-guest-agent gawk virt-what} # rubygem-json} + DEPENDS=${DEPENDS:-util-linux bash curl bind-utils growpart parted parted ruby sudo shadow openssh qemu-guest-agent gawk virt-what} # rubygem-json} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init cloud-init-config-suse} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -165,7 +165,7 @@ case "${TARGET}" in RELSUFFIX=${RELSUFFIX:-} TYPE=${TYPE:-deb} TAGS=${TAGS:-linux deb sysv systemd upstart one} - DEPENDS=${DEPENDS:-util-linux bash curl bind9-host cloud-utils parted ruby ifupdown|ifupdown2 acpid|systemd sudo passwd dbus openssh-server open-vm-tools qemu-guest-agent gawk virt-what} + DEPENDS=${DEPENDS:-util-linux bash curl bind9-host cloud-utils parted ruby ifupdown|ifupdown2 acpid|systemd sudo passwd dbus openssh-server qemu-guest-agent gawk virt-what} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} @@ -180,7 +180,7 @@ case "${TARGET}" in RELSUFFIX=${RELSUFFIX:-} TYPE=${TYPE:-apk} TAGS=${TAGS:-linux apk one} - DEPENDS=${DEPENDS:-util-linux bash curl udev sfdisk parted e2fsprogs-extra sudo shadow ruby ruby-json bind-tools openssh open-vm-tools qemu-guest-agent gawk virt-what} + DEPENDS=${DEPENDS:-util-linux bash curl udev sfdisk parted e2fsprogs-extra sudo shadow ruby ruby-json bind-tools openssh qemu-guest-agent gawk virt-what} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-} #not respected CONFLICTS=${CONFLICTS:-one-context-ec2} @@ -202,7 +202,7 @@ case "${TARGET}" in EXT=${EXT:-pkg.tar.xz} TAGS=${TAGS:-linux arch systemd one networkd} # mkinitcpio-growrootfs ruby-json - DEPENDS=${DEPENDS:-filesystem util-linux bash curl bind-tools ruby sudo shadow open-vm-tools qemu-guest-agent gawk virt-what} + DEPENDS=${DEPENDS:-filesystem util-linux bash curl bind-tools ruby sudo shadow qemu-guest-agent gawk virt-what} PROVIDES=${PROVIDES:-} REPLACES=${REPLACES:-cloud-init} CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2} diff --git a/packer/alma/80-install-context.sh.8 b/packer/alma/80-install-context.sh.8 index 957d6cf6..eeecc650 100644 --- a/packer/alma/80-install-context.sh.8 +++ b/packer/alma/80-install-context.sh.8 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/alma/80-install-context.sh.9 b/packer/alma/80-install-context.sh.9 index ce7d0cc0..a71fdaea 100644 --- a/packer/alma/80-install-context.sh.9 +++ b/packer/alma/80-install-context.sh.9 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/alpine/80-install-context.sh b/packer/alpine/80-install-context.sh index 450781a9..1da8e3bd 100644 --- a/packer/alpine/80-install-context.sh +++ b/packer/alpine/80-install-context.sh @@ -7,14 +7,13 @@ exec 1>&2 set -eux -o pipefail -apk add tzdata haveged open-vm-tools-plugins-all +apk add tzdata haveged LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) apk add --allow-untrusted "$LATEST" rc-update add qemu-guest-agent default -rc-update add open-vm-tools default rc-update add haveged boot sync diff --git a/packer/alt/80-install-context.sh b/packer/alt/80-install-context.sh index f214696f..afc2e82d 100644 --- a/packer/alt/80-install-context.sh +++ b/packer/alt/80-install-context.sh @@ -12,7 +12,7 @@ export DEBIAN_FRONTEND=noninteractive LATEST=$(find /context/ -type f -name "one-context*-$CTXEXT" | sort -V | tail -n1) apt-get remove --purge -y cloud-init -apt-get install -y "$LATEST" haveged open-vm-tools +apt-get install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/amazon/80-install-context.sh.2 b/packer/amazon/80-install-context.sh.2 index faa78159..510febe2 100644 --- a/packer/amazon/80-install-context.sh.2 +++ b/packer/amazon/80-install-context.sh.2 @@ -9,6 +9,6 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -yum install -y "$LATEST" open-vm-tools +yum install -y "$LATEST" sync diff --git a/packer/amazon/80-install-context.sh.2023 b/packer/amazon/80-install-context.sh.2023 index 11e41d92..6f46f185 100644 --- a/packer/amazon/80-install-context.sh.2023 +++ b/packer/amazon/80-install-context.sh.2023 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -yum install -y "$LATEST" open-vm-tools +yum install -y "$LATEST" # WARN: As Amazon2 only supports ifcfg scripts and we don't want to keep 2 different diff --git a/packer/debian/80-install-context.sh.11 b/packer/debian/80-install-context.sh.11 index 07a907b8..208e5551 100644 --- a/packer/debian/80-install-context.sh.11 +++ b/packer/debian/80-install-context.sh.11 @@ -19,7 +19,7 @@ policy_rc_d_disable dpkg -i "$LATEST" || apt-get install -y -f dpkg -i "$LATEST" -apt-get install -y haveged open-vm-tools +apt-get install -y haveged systemctl enable haveged diff --git a/packer/debian/80-install-context.sh.12 b/packer/debian/80-install-context.sh.12 index 577bd13f..360f9e20 100644 --- a/packer/debian/80-install-context.sh.12 +++ b/packer/debian/80-install-context.sh.12 @@ -19,7 +19,7 @@ policy_rc_d_disable dpkg -i "$LATEST" || apt-get install -y -f dpkg -i "$LATEST" -apt-get install -y haveged open-vm-tools +apt-get install -y haveged systemctl enable haveged diff --git a/packer/devuan/80-install-context.sh b/packer/devuan/80-install-context.sh index de89b6f0..ca491081 100644 --- a/packer/devuan/80-install-context.sh +++ b/packer/devuan/80-install-context.sh @@ -19,8 +19,6 @@ policy_rc_d_disable dpkg -i "$LATEST" || apt-get install -y -f dpkg -i "$LATEST" -apt-get install -y open-vm-tools - policy_rc_d_enable sync diff --git a/packer/fedora/80-install-context.sh b/packer/fedora/80-install-context.sh index f2aec88b..efb4cc15 100644 --- a/packer/fedora/80-install-context.sh +++ b/packer/fedora/80-install-context.sh @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/freebsd/script.sh b/packer/freebsd/script.sh index fef7a135..e081ad77 100644 --- a/packer/freebsd/script.sh +++ b/packer/freebsd/script.sh @@ -8,7 +8,7 @@ freebsd-update install --not-running-from-cron || : # contextualize export ASSUME_ALWAYS_YES=yes -pkg install -y curl bash sudo base64 ruby open-vm-tools-nox11 gawk virt-what isc-dhcp44-client +pkg install -y curl bash sudo base64 ruby gawk virt-what isc-dhcp44-client LATEST=$(find /tmp/context/ -type f -name "one-context-*.txz" | sort -V | tail -n1) pkg install -y "$LATEST" pkg clean -ay diff --git a/packer/ol/80-install-context.sh.8 b/packer/ol/80-install-context.sh.8 index 957d6cf6..eeecc650 100644 --- a/packer/ol/80-install-context.sh.8 +++ b/packer/ol/80-install-context.sh.8 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/ol/80-install-context.sh.9 b/packer/ol/80-install-context.sh.9 index ce7d0cc0..a71fdaea 100644 --- a/packer/ol/80-install-context.sh.9 +++ b/packer/ol/80-install-context.sh.9 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/opensuse/80-install-context.sh b/packer/opensuse/80-install-context.sh index 87c3349e..89abfcde 100644 --- a/packer/opensuse/80-install-context.sh +++ b/packer/opensuse/80-install-context.sh @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -zypper --non-interactive --no-gpg-checks install -y "$LATEST" haveged open-vm-tools +zypper --non-interactive --no-gpg-checks install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/rhel/80-install-context.sh.8 b/packer/rhel/80-install-context.sh.8 index 957d6cf6..eeecc650 100644 --- a/packer/rhel/80-install-context.sh.8 +++ b/packer/rhel/80-install-context.sh.8 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/rhel/80-install-context.sh.9 b/packer/rhel/80-install-context.sh.9 index ce7d0cc0..a71fdaea 100644 --- a/packer/rhel/80-install-context.sh.9 +++ b/packer/rhel/80-install-context.sh.9 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/rocky/80-install-context.sh.8 b/packer/rocky/80-install-context.sh.8 index 957d6cf6..eeecc650 100644 --- a/packer/rocky/80-install-context.sh.8 +++ b/packer/rocky/80-install-context.sh.8 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/rocky/80-install-context.sh.9 b/packer/rocky/80-install-context.sh.9 index ce7d0cc0..a71fdaea 100644 --- a/packer/rocky/80-install-context.sh.9 +++ b/packer/rocky/80-install-context.sh.9 @@ -9,7 +9,7 @@ set -eux -o pipefail LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1) -dnf install -y "$LATEST" haveged open-vm-tools +dnf install -y "$LATEST" haveged systemctl enable haveged diff --git a/packer/ubuntu/80-install-context.sh b/packer/ubuntu/80-install-context.sh index d608f526..b5e5e2fd 100644 --- a/packer/ubuntu/80-install-context.sh +++ b/packer/ubuntu/80-install-context.sh @@ -21,7 +21,7 @@ policy_rc_d_disable dpkg -i --auto-deconfigure "$LATEST" || apt-get install -y -f dpkg -i --auto-deconfigure "$LATEST" -apt-get install -y haveged open-vm-tools +apt-get install -y haveged systemctl enable haveged