openstack
/
fuel-main
Code Issues Proposed changes

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
This commit is contained in:
Dmitry Teselkin 2016-03-04 12:33:24 +03:00
parent a42059f528
commit 9114053378
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
iso/isolinux/isolinux.cfg
View File

@ -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