diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-10-12 16:42:35 +0200 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-11-15 15:35:15 +0100 |
| commit | 9f8aff6636e0d86834178b461802f3e7cb95189d (patch) | |
| tree | 3bbfec85cda9774295b5f30f8417ee36e512368d /build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch | |
| parent | 38579142c683dbf26a6560d53d900111f4df4f6b (diff) | |
Uplift to Fuel 10.0/Newton
Build working, automated deploy working (simple test cases only).
All plugins disabled, so is the generation of the local ISO cache.
Both need to be re-enabled after merge of this uplift.
All patches wiped, pertinent ones need to be re-enabled after the
merge of this uplift.
Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch')
| -rw-r--r-- | build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch b/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch deleted file mode 100644 index dbff8c7d4..000000000 --- a/build/f_repos/patch/fuel-main/0002-OPNFV-showmenu-yes-in-isolinux.cfg.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Fuel OPNFV <fuel@opnfv.org> -Date: Mon, 13 Jun 2016 22:23:57 +0200 -Subject: [PATCH] OPNFV: showmenu=yes in isolinux.cfg - ---- - iso/isolinux/isolinux.cfg | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/iso/isolinux/isolinux.cfg b/iso/isolinux/isolinux.cfg -index c6b1ed9..77a4b18 100644 ---- a/iso/isolinux/isolinux.cfg -+++ b/iso/isolinux/isolinux.cfg -@@ -19,9 +19,9 @@ label nailgun - menu label ^1. Fuel Install (Static IP) - menu default - kernel vmlinuz -- 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 -+ 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 showmenu=yes - - label nailgunifname - menu label ^2. Fuel Advanced Install (Static IP) - kernel vmlinuz -- 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 -+ 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 showmenu=yes |