Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

This commit is contained in:
Jason Tibbitts 2012-06-12 15:16:45 -05:00
commit 81508c9bd5
3 changed files with 5 additions and 1 deletions

View file

@ -36,3 +36,4 @@ bin/ipxe.iso
bin/ipxe.dsk
bin/ipxe.lkrn
bin/ipxe.usb

View file

@ -10,6 +10,7 @@ label Fedora-17-i386
MENU LABEL Fedora-17-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/images/pxeboot/initrd.img
APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/
TEXT HELP
Selecting this will boot the Fedora 17 i386 installer.
ENDTEXT
@ -18,6 +19,7 @@ label Fedora-17-x86_64
MENU LABEL Fedora-17-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/images/pxeboot/initrd.img
APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os/
TEXT HELP
Selecting this will boot the Fedora 17 x86_64 installer.
ENDTEXT

View file

@ -18,7 +18,8 @@ label hdt
label memtest86+-4.20
menu memtest86+-4.20
kernel memtest86+-4.20
kernel http://download.fedoraproject.org/pub/alt/bfo/memtest86+-4.20
append -
TEXT HELP
Memtest86+ is a thorough stand-alone memory test for x86 and x86-64
architecture computers. BIOS based memory tests are only a quick