From 31db3ea9da5b24eac8b79c77e14f6778fe7595d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20L=C3=B6ser?= Date: Thu, 5 Dec 2024 07:12:55 +0100 Subject: [PATCH] Fixes #38067 - Replace deprecated wget "-Y off" As the parameter is not part of the manpage anymore [1] (but still supported for backward compatibility reasons [2]) this might confuse people. Correct parameter would be `wget --no-proxy`. [1]:http://git.savannah.gnu.org/cgit/wget.git/commit/?id=0734d8dd3744825c4db56ef0f50bcff111efa18e [2]:http://git.savannah.gnu.org/cgit/wget.git/commit/?id=e3acbd2aaf2c1a6556b20243781f4e4b83dbd2a2 --- .../provisioning_templates/provision/preseed_default.erb | 2 +- .../user_data/preseed_autoinstall_cloud_init.erb | 2 +- .../provision/Preseed_default.debian4dhcp.snap.txt | 2 +- .../provision/Preseed_default.ubuntu4dhcp.snap.txt | 2 +- ...toinstall_cloud-init_user_data.ubuntu_autoinst4dhcp.snap.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/unattended/provisioning_templates/provision/preseed_default.erb b/app/views/unattended/provisioning_templates/provision/preseed_default.erb index 25c86cae21d..5a937b41c9b 100644 --- a/app/views/unattended/provisioning_templates/provision/preseed_default.erb +++ b/app/views/unattended/provisioning_templates/provision/preseed_default.erb @@ -168,4 +168,4 @@ d-i finish-install/reboot_in_progress note <%= snippet_if_exists(template_name + " custom post") -%> -d-i preseed/late_command string wget -Y off <%= @static ? "'#{foreman_url('finish', static: 'true')}'" : foreman_url('finish') %> -O /target/tmp/finish.sh && in-target chmod +x /tmp/finish.sh && in-target /tmp/finish.sh +d-i preseed/late_command string wget --no-proxy <%= @static ? "'#{foreman_url('finish', static: 'true')}'" : foreman_url('finish') %> -O /target/tmp/finish.sh && in-target chmod +x /tmp/finish.sh && in-target /tmp/finish.sh diff --git a/app/views/unattended/provisioning_templates/user_data/preseed_autoinstall_cloud_init.erb b/app/views/unattended/provisioning_templates/user_data/preseed_autoinstall_cloud_init.erb index ca21f919b5d..211110874e4 100644 --- a/app/views/unattended/provisioning_templates/user_data/preseed_autoinstall_cloud_init.erb +++ b/app/views/unattended/provisioning_templates/user_data/preseed_autoinstall_cloud_init.erb @@ -72,6 +72,6 @@ autoinstall: <%= indent(2) { snippet_if_exists(template_name + " custom root") } -%> late-commands: <%= indent(2) { snippet 'preseed_autoinstall_clevis_tang_wrapper' if host_param('disk_enc_tang_servers') && os_major >= 22 } %> - - wget -Y off <%= @static ? "'#{foreman_url('finish', static: 'true')}'" : foreman_url('finish') %> -O /target/tmp/finish.sh + - wget --no-proxy <%= @static ? "'#{foreman_url('finish', static: 'true')}'" : foreman_url('finish') %> -O /target/tmp/finish.sh - curtin in-target -- chmod +x /tmp/finish.sh - curtin in-target -- /tmp/finish.sh diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.debian4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.debian4dhcp.snap.txt index 654e537f697..68879058626 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.debian4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.debian4dhcp.snap.txt @@ -78,4 +78,4 @@ d-i grub-installer/with_other_os boolean true d-i finish-install/reboot_in_progress note -d-i preseed/late_command string wget -Y off http://foreman.example.com/unattended/finish -O /target/tmp/finish.sh && in-target chmod +x /tmp/finish.sh && in-target /tmp/finish.sh +d-i preseed/late_command string wget --no-proxy http://foreman.example.com/unattended/finish -O /target/tmp/finish.sh && in-target chmod +x /tmp/finish.sh && in-target /tmp/finish.sh diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.ubuntu4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.ubuntu4dhcp.snap.txt index 36a3372a553..fb013165268 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.ubuntu4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/provision/Preseed_default.ubuntu4dhcp.snap.txt @@ -78,4 +78,4 @@ d-i grub-installer/with_other_os boolean true d-i finish-install/reboot_in_progress note -d-i preseed/late_command string wget -Y off http://foreman.example.com/unattended/finish -O /target/tmp/finish.sh && in-target chmod +x /tmp/finish.sh && in-target /tmp/finish.sh +d-i preseed/late_command string wget --no-proxy http://foreman.example.com/unattended/finish -O /target/tmp/finish.sh && in-target chmod +x /tmp/finish.sh && in-target /tmp/finish.sh diff --git a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Preseed_Autoinstall_cloud-init_user_data.ubuntu_autoinst4dhcp.snap.txt b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Preseed_Autoinstall_cloud-init_user_data.ubuntu_autoinst4dhcp.snap.txt index 7425507a9be..15de0ca8f6d 100644 --- a/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Preseed_Autoinstall_cloud-init_user_data.ubuntu_autoinst4dhcp.snap.txt +++ b/test/unit/foreman/renderer/snapshots/ProvisioningTemplate/user_data/Preseed_Autoinstall_cloud-init_user_data.ubuntu_autoinst4dhcp.snap.txt @@ -34,6 +34,6 @@ autoinstall: late-commands: - - wget -Y off http://foreman.example.com/unattended/finish -O /target/tmp/finish.sh + - wget --no-proxy http://foreman.example.com/unattended/finish -O /target/tmp/finish.sh - curtin in-target -- chmod +x /tmp/finish.sh - curtin in-target -- /tmp/finish.sh