From 4b30f55e77b8cff78d4f8e4403474b1c812418af Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 15 Feb 2016 08:02:28 -0700 Subject: [PATCH] Update bfo for f21 retirement and add rd.timeout (fixes bug #1306427) --- bfo/pxelinux.cfg/fedora_eol.conf | 18 ++++++++++++++++++ bfo/pxelinux.cfg/fedora_install.conf | 26 ++++---------------------- bfo/pxelinux.cfg/fedora_rawhide.conf | 8 ++++---- bfo/pxelinux.cfg/fedora_rescue.conf | 26 ++++---------------------- 4 files changed, 30 insertions(+), 48 deletions(-) diff --git a/bfo/pxelinux.cfg/fedora_eol.conf b/bfo/pxelinux.cfg/fedora_eol.conf index 4d0262f..cd783be 100644 --- a/bfo/pxelinux.cfg/fedora_eol.conf +++ b/bfo/pxelinux.cfg/fedora_eol.conf @@ -6,6 +6,24 @@ TEXT HELP Install end of life and no longer supported versions of Fedora from the archives ENDTEXT +label Fedora-21-x86_64 + MENU LABEL Fedora-21-x86_64 + kernel http://download.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/os/images/pxeboot/vmlinuz + initrd http://download.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/os/images/pxeboot/initrd.img + APPEND repo=http://download.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/os/ + TEXT HELP + Selecting this will boot the Fedora 21 x86_64 Server installer. + ENDTEXT + +label Fedora-21-i386 + MENU LABEL Fedora-21-i386 + kernel http://download.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/os/images/pxeboot/vmlinuz + initrd http://download.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/os/images/pxeboot/initrd.img + APPEND repo=http://download.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/os/ + TEXT HELP + Selecting this will boot the Fedora 21 i386 Server installer. + ENDTEXT + label Fedora-20-x86_64 MENU LABEL Fedora-20-x86_64 kernel http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Fedora/x86_64/os/images/pxeboot/vmlinuz diff --git a/bfo/pxelinux.cfg/fedora_install.conf b/bfo/pxelinux.cfg/fedora_install.conf index abfd8ad..53d7d05 100644 --- a/bfo/pxelinux.cfg/fedora_install.conf +++ b/bfo/pxelinux.cfg/fedora_install.conf @@ -10,7 +10,7 @@ label Fedora-23-x86_64 MENU LABEL Fedora-23-x86_64 kernel http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/ + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 23 x86_64 Server installer. ENDTEXT @@ -19,7 +19,7 @@ label Fedora-23-i386 MENU LABEL Fedora-23-i386 kernel http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/ + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 23 i386 Server installer. ENDTEXT @@ -28,7 +28,7 @@ label Fedora-22-x86_64 MENU LABEL Fedora-22-x86_64 kernel http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/ + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 22 x86_64 Server installer. ENDTEXT @@ -37,29 +37,11 @@ label Fedora-22-i386 MENU LABEL Fedora-22-i386 kernel http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/ + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 22 i386 Server installer. ENDTEXT -label Fedora-21-x86_64 - MENU LABEL Fedora-21-x86_64 - kernel http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/images/pxeboot/vmlinuz - initrd http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/ - TEXT HELP - Selecting this will boot the Fedora 21 x86_64 Server installer. - ENDTEXT - -label Fedora-21-i386 - MENU LABEL Fedora-21-i386 - kernel http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/images/pxeboot/vmlinuz - initrd http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/ - TEXT HELP - Selecting this will boot the Fedora 21 i386 Server installer. - ENDTEXT - label uplvl MENU LABEL ^Back MENU EXIT diff --git a/bfo/pxelinux.cfg/fedora_rawhide.conf b/bfo/pxelinux.cfg/fedora_rawhide.conf index 8ae2500..490405b 100644 --- a/bfo/pxelinux.cfg/fedora_rawhide.conf +++ b/bfo/pxelinux.cfg/fedora_rawhide.conf @@ -10,7 +10,7 @@ label Fedora-rawhide-x86_64 MENU LABEL Fedora-rawhide-x86_64 kernel http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora Rawhide x86_64 installer. See: http://fedoraproject.org/wiki/Releases/Rawhide for more info @@ -20,7 +20,7 @@ label Fedora-rawhide-i386 MENU LABEL Fedora-rawhide-i386 kernel http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/ + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora Rawhide 32 bit installer. See: http://fedoraproject.org/wiki/Releases/Rawhide for more info @@ -30,7 +30,7 @@ label Fedora-rawhide-x86_64-rescue MENU LABEL Fedora-rawhide-x86_64-rescue kernel http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ rescue + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/ rescue rd.timeout=60 TEXT HELP Selecting this will boot the Fedora Rawhide x86_64 installer in rescue mode. See: http://fedoraproject.org/wiki/Releases/Rawhide for more info @@ -40,7 +40,7 @@ label Fedora-rawhide-i386-rescue MENU LABEL Fedora-rawhide-i386-rescue kernel http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/ rescue + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/i386/os/ rescue rd.timeout=60 TEXT HELP Selecting this will boot the Fedora Rawhide 32 bit installer in rescue mode. See: http://fedoraproject.org/wiki/Releases/Rawhide for more info diff --git a/bfo/pxelinux.cfg/fedora_rescue.conf b/bfo/pxelinux.cfg/fedora_rescue.conf index aeed2b6..762e92d 100644 --- a/bfo/pxelinux.cfg/fedora_rescue.conf +++ b/bfo/pxelinux.cfg/fedora_rescue.conf @@ -11,7 +11,7 @@ label Fedora-23-i386-rescue MENU LABEL Fedora-23-i386-rescue kernel http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/i386/os/images/pxeboot/initrd.img - APPEND rescue + APPEND rescue rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 23 i386 installer in rescue mode ENDTEXT @@ -20,7 +20,7 @@ label Fedora-23-x86_64-rescue MENU LABEL Fedora-23-x86_64-rescue kernel http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/23/Server/x86_64/os/images/pxeboot/initrd.img - APPEND rescue + APPEND rescue rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 23 x86_64 installer in rescue mode. ENDTEXT @@ -29,7 +29,7 @@ label Fedora-22-i386-rescue MENU LABEL Fedora-22-i386-rescue kernel http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/images/pxeboot/initrd.img - APPEND rescue + APPEND rescue rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 22 i386 installer in rescue mode ENDTEXT @@ -38,29 +38,11 @@ label Fedora-22-x86_64-rescue MENU LABEL Fedora-22-x86_64-rescue kernel http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/images/pxeboot/vmlinuz initrd http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/images/pxeboot/initrd.img - APPEND rescue + APPEND rescue rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 22 x86_64 installer in rescue mode. ENDTEXT -label Fedora-21-i386-rescue - MENU LABEL Fedora-21-i386-rescue - kernel http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/images/pxeboot/vmlinuz - initrd http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/images/pxeboot/initrd.img - APPEND rescue - TEXT HELP - Selecting this will boot the Fedora 21 i386 installer in rescue mode - ENDTEXT - -label Fedora-21-x86_64-rescue - MENU LABEL Fedora-21-x86_64-rescue - kernel http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/images/pxeboot/vmlinuz - initrd http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/images/pxeboot/initrd.img - APPEND rescue - TEXT HELP - Selecting this will boot the Fedora 21 x86_64 installer in rescue mode. - ENDTEXT - label uplvl MENU LABEL ^Back MENU EXIT