From 789d79ee1bdd24a256093f9ad700a927aa73458e Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 12 Sep 2018 10:45:38 -0400 Subject: [PATCH] cobbler: Install curl during Ubuntu kickstart I replaced wget with curl in rc.local because curl is installed by default in RPM-based distros while wget isn't even available for RHEL8 (yet?). It apparently is not installed by default in Ubuntu though so we'll install it during kickstart. Fixes: http://tracker.ceph.com/issues/35952 Signed-off-by: David Galloway --- roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed | 6 +++--- .../cobbler/templates/kickstarts/cephlab_ubuntu_sdm.preseed | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed b/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed index e5506c4d..38e0d9ce 100644 --- a/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed +++ b/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed @@ -101,11 +101,11 @@ d-i user-setup/encrypt-home boolean false #if $os_version == 'precise' d-i pkgsel/include string wget ntpdate bash sudo openssh-server #else if int($distro_ver_major) == 16 -d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool +d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool curl #else if int($distro_ver_major) == 18 -d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server gawk gdisk ethtool net-tools ifupdown python ntp +d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server gawk gdisk ethtool net-tools ifupdown python ntp curl #else -d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware linux-firmware-nonfree ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool +d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware linux-firmware-nonfree ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool curl #end if # Whether to upgrade packages after debootstrap. diff --git a/roles/cobbler/templates/kickstarts/cephlab_ubuntu_sdm.preseed b/roles/cobbler/templates/kickstarts/cephlab_ubuntu_sdm.preseed index 506a25cf..7e4f3117 100644 --- a/roles/cobbler/templates/kickstarts/cephlab_ubuntu_sdm.preseed +++ b/roles/cobbler/templates/kickstarts/cephlab_ubuntu_sdm.preseed @@ -102,11 +102,11 @@ d-i user-setup/encrypt-home boolean false #if $os_version == 'precise' d-i pkgsel/include string wget ntpdate bash sudo openssh-server #else if int($distro_ver_major) == 16 -d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool +d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool curl #else if int($distro_ver_major) == 18 -d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server gawk gdisk ethtool net-tools ifupdown python ntp +d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server gawk gdisk ethtool net-tools ifupdown python ntp curl #else -d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware linux-firmware-nonfree ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool +d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware linux-firmware-nonfree ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk gdisk ethtool curl #end if # Whether to upgrade packages after debootstrap. -- 2.47.3