From 9114053378be00cd4d94d849ffc07903f407153e Mon Sep 17 00:00:00 2001 From: Dmitry Teselkin Date: Fri, 4 Mar 2016 12:33:24 +0300 Subject: [PATCH] Fix anaconda boot parameters Anaconda boot parameters have been changed some time ago: * 'repo' and 'ks' deprecated, use 'inst.repo' and 'inst.ks' instead * 'harddrive' means "find and .iso file on partition and mount" and doesn't work correctly for USB boot Because of these changes we should use 'inst.repo=cdrom:...' and 'inst.ks=cdrom:...' in 3rd boot option (USB boot). However, in that case the 1st and 3rd boot options can be combined together. This simplifies boot menu and QA framework. Change-Id: I52aa93c605fbfcd2acdd5ef2bd343516254f615e Closes-bug: #1540862 --- iso/isolinux/isolinux.cfg | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/iso/isolinux/isolinux.cfg b/iso/isolinux/isolinux.cfg index f556d9910..c6b1ed9eb 100644 --- a/iso/isolinux/isolinux.cfg +++ b/iso/isolinux/isolinux.cfg @@ -19,14 +19,9 @@ label nailgun menu label ^1. Fuel Install (Static IP) menu default kernel vmlinuz - append initrd=initrd.img net.ifnames=0 biosdevname=0 ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 showmenu=yes + append initrd=initrd.img net.ifnames=0 biosdevname=0 inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: nameserver=10.20.0.1 label nailgunifname menu label ^2. Fuel Advanced Install (Static IP) kernel vmlinuz - append initrd=initrd.img ks=hd:sr0:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: dns1=10.20.0.1 ifname=adminif:XX:XX:XX:XX:XX:XX showmenu=yes - -label usbboot - menu label ^3. USB Fuel Install (Static IP) - kernel vmlinuz - append initrd=initrd.img net.ifnames=0 biosdevname=0 repo=hd:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ ks=hd:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:eth0:off::: dns1=10.20.0.1 showmenu=yes + append initrd=initrd.img inst.repo=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ inst.ks=cdrom:LABEL=will_be_substituted_with_ISO_VOLUME_ID:/ks.cfg ip=10.20.0.2::10.20.0.1:255.255.255.0:fuel.domain.tld:adminif:off::: nameserver=10.20.0.1 ifname=adminif:XX:XX:XX:XX:XX:XX