cobbler: Make Ubuntu kickstart compatible with Xenial

linux-firmware-nonfree package is not available in Xenial

Installer was also stopping after package install asking for
GRUB install destination.  Adding the 'bootdev string default'
line bypasses the message and is already the lab default so
shouldn't affect other distro versions.

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed b/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed
index 098a290432dbe6d7abaa589105e0f84dbb66e97c..c67f616096da1fcd851b6392600bf14e782cb2ba 100644 (file)
--- a/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed
+++ b/roles/cobbler/templates/kickstarts/cephlab_ubuntu.preseed
@@ -94,6 +94,8 @@ d-i user-setup/encrypt-home boolean false
 # Individual additional packages to install
 #if $os_version == 'precise'
 d-i pkgsel/include string wget ntpdate bash sudo openssh-server
+#else if $os_version == 'xenial'
+d-i pkgsel/include string u-boot-tools pastebinit initramfs-tools wget linux-firmware ntpdate bash devmem2 fbset sudo openssh-server udev-discover gawk
 #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
 #end if
@@ -107,6 +109,9 @@ d-i pkgsel/upgrade select safe-upgrade
 # "landscape" (manage system with Landscape).
 d-i pkgsel/update-policy select none
 
+# Install GRUB to default location.  Required as of Xenial.
+d-i grub-installer/bootdev  string default
+
 # During installations from serial console, the regular virtual consoles
 # (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next
 # line to prevent this.