Skip to content

Commit 39fc742

Browse files
xorelxorel
authored
M #-: Remove open-vm-tools (#186)
1 parent 9fbb177 commit 39fc742

21 files changed

+30
-40
lines changed

‎appliances/VRouter/Failover/main.rb‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ def install(initdir: '/etc/init.d')
3838
def configure
3939
msg :info, 'Failover::configure'
4040

41-
puts bash <<~SCRIPT
42-
if [[ "$(virt-what)" != vmware ]]; then
43-
rc-update del open-vm-tools default && rc-update -u ||:
44-
rc-service open-vm-tools stop ||:
45-
fi
46-
SCRIPT
47-
4841
toggle [:enable, :start]
4942
end
5043

‎context-linux/targets.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ case "${TARGET}" in
2222
TYPE=${TYPE:-freebsd}
2323
EXT=${EXT:-txz}
2424
TAGS=${TAGS:-bsd bsd_rc one sysv crond}
25-
DEPENDS=${DEPENDS:-sudo bash curl base64 ruby open-vm-tools-nox11 gawk virt-what}
25+
DEPENDS=${DEPENDS:-sudo bash curl base64 ruby gawk virt-what}
2626
PROVIDES=${PROVIDES:-}
2727
REPLACES=${REPLACES:-addon-context}
2828
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -38,7 +38,7 @@ case "${TARGET}" in
3838
TYPE=${TYPE:-rpm}
3939
TAGS=${TAGS:-linux rpm systemd one network-scripts}
4040
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}
41-
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
41+
RECOMMENDS=${RECOMMENDS:-}
4242
PROVIDES=${PROVIDES:-}
4343
REPLACES=${REPLACES:-cloud-init}
4444
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -54,7 +54,7 @@ case "${TARGET}" in
5454
TYPE=${TYPE:-rpm}
5555
TAGS=${TAGS:-linux rpm systemd one}
5656
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}
57-
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
57+
RECOMMENDS=${RECOMMENDS:-}
5858
PROVIDES=${PROVIDES:-}
5959
REPLACES=${REPLACES:-cloud-init}
6060
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -70,7 +70,7 @@ case "${TARGET}" in
7070
TYPE=${TYPE:-rpm}
7171
TAGS=${TAGS:-linux rpm systemd one}
7272
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}
73-
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
73+
RECOMMENDS=${RECOMMENDS:-}
7474
PROVIDES=${PROVIDES:-}
7575
REPLACES=${REPLACES:-cloud-init}
7676
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -86,7 +86,7 @@ case "${TARGET}" in
8686
TYPE=${TYPE:-rpm}
8787
TAGS=${TAGS:-linux rpm systemd one}
8888
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}
89-
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
89+
RECOMMENDS=${RECOMMENDS:-}
9090
PROVIDES=${PROVIDES:-}
9191
REPLACES=${REPLACES:-cloud-init}
9292
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -102,7 +102,7 @@ case "${TARGET}" in
102102
TYPE=${TYPE:-rpm}
103103
TAGS=${TAGS:-linux rpm systemd one network-scripts}
104104
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}
105-
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
105+
RECOMMENDS=${RECOMMENDS:-}
106106
PROVIDES=${PROVIDES:-}
107107
REPLACES=${REPLACES:-cloud-init}
108108
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -118,7 +118,7 @@ case "${TARGET}" in
118118
TYPE=${TYPE:-rpm}
119119
TAGS=${TAGS:-linux rpm systemd one network-scripts}
120120
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}
121-
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
121+
RECOMMENDS=${RECOMMENDS:-}
122122
PROVIDES=${PROVIDES:-}
123123
REPLACES=${REPLACES:-cloud-init cloud-init-cfg-onprem}
124124
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -134,7 +134,7 @@ case "${TARGET}" in
134134
RELSUFFIX=${RELSUFFIX:-alt}
135135
TYPE=${TYPE:-rpm}
136136
TAGS=${TAGS:-linux rpm systemd one networkd}
137-
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}
137+
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}
138138
PROVIDES=${PROVIDES:-}
139139
REPLACES=${REPLACES:-cloud-init}
140140
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -150,7 +150,7 @@ case "${TARGET}" in
150150
RELSUFFIX=${RELSUFFIX:-.suse}
151151
TYPE=${TYPE:-rpm}
152152
TAGS=${TAGS:-linux rpm systemd one network-scripts}
153-
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}
153+
DEPENDS=${DEPENDS:-util-linux bash curl bind-utils growpart parted parted ruby sudo shadow openssh qemu-guest-agent gawk virt-what} # rubygem-json}
154154
PROVIDES=${PROVIDES:-}
155155
REPLACES=${REPLACES:-cloud-init cloud-init-config-suse}
156156
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -165,7 +165,7 @@ case "${TARGET}" in
165165
RELSUFFIX=${RELSUFFIX:-}
166166
TYPE=${TYPE:-deb}
167167
TAGS=${TAGS:-linux deb sysv systemd upstart one}
168-
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}
168+
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}
169169
PROVIDES=${PROVIDES:-}
170170
REPLACES=${REPLACES:-cloud-init}
171171
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -180,7 +180,7 @@ case "${TARGET}" in
180180
RELSUFFIX=${RELSUFFIX:-}
181181
TYPE=${TYPE:-apk}
182182
TAGS=${TAGS:-linux apk one}
183-
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}
183+
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}
184184
PROVIDES=${PROVIDES:-}
185185
REPLACES=${REPLACES:-} #not respected
186186
CONFLICTS=${CONFLICTS:-one-context-ec2}
@@ -202,7 +202,7 @@ case "${TARGET}" in
202202
EXT=${EXT:-pkg.tar.xz}
203203
TAGS=${TAGS:-linux arch systemd one networkd}
204204
# mkinitcpio-growrootfs ruby-json
205-
DEPENDS=${DEPENDS:-filesystem util-linux bash curl bind-tools ruby sudo shadow open-vm-tools qemu-guest-agent gawk virt-what}
205+
DEPENDS=${DEPENDS:-filesystem util-linux bash curl bind-tools ruby sudo shadow qemu-guest-agent gawk virt-what}
206206
PROVIDES=${PROVIDES:-}
207207
REPLACES=${REPLACES:-cloud-init}
208208
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}

‎packer/alma/80-install-context.sh.8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -eux -o pipefail
99

1010
LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1)
1111

12-
dnf install -y "$LATEST" haveged open-vm-tools
12+
dnf install -y "$LATEST" haveged
1313

1414
systemctl enable haveged
1515

‎packer/alma/80-install-context.sh.9‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -eux -o pipefail
99

1010
LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1)
1111

12-
dnf install -y "$LATEST" haveged open-vm-tools
12+
dnf install -y "$LATEST" haveged
1313

1414
systemctl enable haveged
1515

‎packer/alpine/80-install-context.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
exec 1>&2
88
set -eux -o pipefail
99

10-
apk add tzdata haveged open-vm-tools-plugins-all
10+
apk add tzdata haveged
1111

1212
LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1)
1313

1414
apk add --allow-untrusted "$LATEST"
1515

1616
rc-update add qemu-guest-agent default
17-
rc-update add open-vm-tools default
1817
rc-update add haveged boot
1918

2019
sync

‎packer/alt/80-install-context.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export DEBIAN_FRONTEND=noninteractive
1212
LATEST=$(find /context/ -type f -name "one-context*-$CTXEXT" | sort -V | tail -n1)
1313

1414
apt-get remove --purge -y cloud-init
15-
apt-get install -y "$LATEST" haveged open-vm-tools
15+
apt-get install -y "$LATEST" haveged
1616

1717
systemctl enable haveged
1818

‎packer/amazon/80-install-context.sh.2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ set -eux -o pipefail
99

1010
LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1)
1111

12-
yum install -y "$LATEST" open-vm-tools
12+
yum install -y "$LATEST"
1313

1414
sync

‎packer/amazon/80-install-context.sh.2023‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -eux -o pipefail
99

1010
LATEST=$(find /context/ -type f -name "one-context*.$CTXEXT" | sort -V | tail -n1)
1111

12-
yum install -y "$LATEST" open-vm-tools
12+
yum install -y "$LATEST"
1313

1414

1515
# WARN: As Amazon2 only supports ifcfg scripts and we don't want to keep 2 different

‎packer/debian/80-install-context.sh.11‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ policy_rc_d_disable
1919
dpkg -i "$LATEST" || apt-get install -y -f
2020
dpkg -i "$LATEST"
2121

22-
apt-get install -y haveged open-vm-tools
22+
apt-get install -y haveged
2323

2424
systemctl enable haveged
2525

‎packer/debian/80-install-context.sh.12‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ policy_rc_d_disable
1919
dpkg -i "$LATEST" || apt-get install -y -f
2020
dpkg -i "$LATEST"
2121

22-
apt-get install -y haveged open-vm-tools
22+
apt-get install -y haveged
2323

2424
systemctl enable haveged
2525

0 commit comments

Comments
 (0)