Freeze break request: Fix pxeboot menu labels

[Ricky Elrod]

commit 768e9bd0cc104585e112397109d3ed526678edd2
Author: Ricky Elrod <codeblock at fedoraproject.org>
Date:   Mon Mar 9 18:54:38 2015 +0000

    Fedora 21 is not Fedora 22

    Signed-off-by: Ricky Elrod <codeblock at fedoraproject.org>

diff --git
a/roles/tftp_server/files/default.noc01.phx2.fedoraproject.org
b/roles/tftp_server/files/default.noc01.phx2.fedoraproject.org
index f5b80a0..c56b115 100644
--- a/roles/tftp_server/files/default.noc01.phx2.fedoraproject.org
+++ b/roles/tftp_server/files/default.noc01.phx2.fedoraproject.org
@@ -61,17 +61,17 @@ LABEL Fed20-x86_64-novnc
      APPEND ks initrd=images/Fedora/20/x86_64/initrd.img
method=http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/
ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/hardware-f20.cfg nomodeset

 LABEL Fed21-x86_64-buildhw
-     MENU LABEL Fedora22-x86_64-buildhw
+     MENU LABEL Fedora21-x86_64-buildhw
      KERNEL images/Fedora/21/x86_64/vmlinuz
      APPEND ks initrd=images/Fedora/21/x86_64/initrd.img
method=http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/
ip=dhcp ks=http://10.5.126.23/repo/rhel/ks/buildhw-fedora-21 text
net.ifnames=0 biosdevname=0

 LABEL Fed21-ppc64
-     MENU LABEL Fedora22-ppc64
+     MENU LABEL Fedora21-ppc64
      KERNEL images/Fedora/21/ppc64/vmlinuz
      APPEND ks initrd=images/Fedora/21/ppc64/initrd.img
method=http://10.5.126.23/pub/fedora-secondary/releases/21/Server/ppc64/os/
ip=dhcp net.ifnames=0 biosdevname=0 vnc

 LABEL Fed21-ppc64le
-     MENU LABEL Fedora22-ppc64le
+     MENU LABEL Fedora21-ppc64le
      KERNEL images/Fedora/21/ppc64le/vmlinuz
      APPEND ks initrd=images/Fedora/21/ppc64le/initrd.img
method=http://10.5.126.23/pub/fedora-secondary/releases/21/Server/ppc64le/os/
ip=dhcp net.ifnames=0 biosdevname=0 vnc


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20150309/062086c9/attachment-0001.sig>