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

This commit is contained in:
Jason Tibbitts 2013-06-12 12:07:07 -05:00
commit 44b95a2ea7
5 changed files with 109 additions and 69 deletions

View file

@ -15,5 +15,6 @@ LABEL bootlocal
menu include pxelinux.cfg/fedora_install.conf Install
menu include pxelinux.cfg/fedora_rescue.conf Rescue
menu include pxelinux.cfg/fedora_prerelease.conf Prerelease
menu include pxelinux.cfg/fedora_eol.conf EndOfLife
menu include pxelinux.cfg/utilities.conf Utilities
menu include pxelinux.cfg/bfo.conf About BFO

View file

@ -0,0 +1,83 @@
PROMPT 0
MENU TITLE Install
MENU LABEL ^Install
TEXT HELP
Install end of life and no longer supported versions of Fedora
ENDTEXT
label Fedora-16-i386
MENU LABEL Fedora-16-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 16 i386 installer.
ENDTEXT
label Fedora-16-x86_64
MENU LABEL Fedora-16-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 16 x86_64 installer.
ENDTEXT
label Fedora-15-i386
MENU LABEL Fedora-15-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 15 i386 installer.
ENDTEXT
label Fedora-15-x86_64
MENU LABEL Fedora-15-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 15 x86_64 installer.
ENDTEXT
label Fedora-14-i386
MENU LABEL Fedora-14-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 14 i386 installer.
ENDTEXT
label Fedora-14-x86_64
MENU LABEL Fedora-14-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 14 x86_64 installer.
ENDTEXT
label Fedora-13-i386
MENU LABEL Fedora-13-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 13 i386 installer.
ENDTEXT
label Fedora-13-x86_64
MENU LABEL Fedora-13-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 13 x86_64 installer.
ENDTEXT
label uplvl
MENU LABEL Back
MENU EXIT
label spacer
MENU LABEL

View file

@ -42,74 +42,6 @@ label Fedora-17-x86_64
Selecting this will boot the Fedora 17 x86_64 installer.
ENDTEXT
label Fedora-16-i386
MENU LABEL Fedora-16-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 16 i386 installer.
ENDTEXT
label Fedora-16-x86_64
MENU LABEL Fedora-16-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 16 x86_64 installer.
ENDTEXT
label Fedora-15-i386
MENU LABEL Fedora-15-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 15 i386 installer.
ENDTEXT
label Fedora-15-x86_64
MENU LABEL Fedora-15-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/images/pxeboot/initrd.img
TEXT HELP
Selecting this will boot the Fedora 15 x86_64 installer.
ENDTEXT
label Fedora-14-i386
MENU LABEL Fedora-14-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/i386/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 14 i386 installer.
ENDTEXT
label Fedora-14-x86_64
MENU LABEL Fedora-14-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora/x86_64/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 14 x86_64 installer.
ENDTEXT
label Fedora-13-i386
MENU LABEL Fedora-13-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 13 i386 installer.
ENDTEXT
label Fedora-13-x86_64
MENU LABEL Fedora-13-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/initrd.img
append stage2=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/install.img
TEXT HELP
Selecting this will boot the Fedora 13 x86_64 installer.
ENDTEXT
label uplvl
MENU LABEL Back
MENU EXIT

View file

@ -6,6 +6,26 @@ TEXT HELP
Install Pre-release versions of Fedora (Alpha, Beta).
ENDTEXT
label Fedora-19-Beta-i386
MENU LABEL Fedora-19-Beta-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/test/19-Beta/Fedora/i386/os/images/pxeboot/vmlinuz-PAE
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/test/19-Beta/Fedora/i386/os/images/pxeboot/initrd-PAE.img
APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/19/i386/os/
TEXT HELP
Selecting this will boot the Fedora 19 Beta i386 installer.
Note that this is a PRE-RELEASE version.
ENDTEXT
label Fedora-19-Beta-x86_64
MENU LABEL Fedora-19-Beta-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/test/19-Beta/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/test/19-Beta/Fedora/x86_64/os/images/pxeboot/initrd.img
APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/19/x86_64/os/
TEXT HELP
Selecting this will boot the Fedora 19 Beta x86_64 installer.
Note that this is a PRE-RELEASE version.
ENDTEXT
label Fedora-19-Alpha-i386
MENU LABEL Fedora-19-Alpha-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/test/19-Alpha/Fedora/i386/os/images/pxeboot/vmlinuz-PAE

View file

@ -766,6 +766,8 @@ if __name__ == '__main__':
print "No requests to process!"
exit(0)
bugcount = len(bugs)
print "Making sure " + options.pkghost + " is available..."
try:
sshsock = socket.create_connection((options.pkghost, 80))
@ -803,10 +805,11 @@ if __name__ == '__main__':
# Iterate over bugs
newre = re.compile('^New Package .* Request', re.MULTILINE)
changere = re.compile('^Package Change Request', re.MULTILINE)
bugcounter=1
for i in bugs:
firstfound = True
type = ''
print "Parsing bug %d - https://bugzilla.redhat.com/%d" % (i.id, i.id)
print "Parsing bug %d - https://bugzilla.redhat.com/%d - processing %s of %s" % (i.id, i.id, str(bugcounter), str(bugcount))
for j in reversed(comments['bugs'][str(i.id)]['comments']):
if newre.search(j['text']):
type = 'new'
@ -831,6 +834,7 @@ if __name__ == '__main__':
processed = create_branches(package, options.pkghost, options.pkghostlocal, processed)
if not more:
break
bugcounter = bugcounter + 1
if len(processed):
print '\nYou must now run this on the git server\nto set up the git repository:'