From 16a4dd2790264d6d58ae828b54f179fad8a4ef31 Mon Sep 17 00:00:00 2001 From: Peter 'Pessoft' Kolínek Date: Apr 11 2018 18:44:53 +0000 Subject: [PATCH 1/2] fix f28 paths remove IPAPPEND from some back menu items fix README.rst code blocks and Git repository URLs --- diff --git a/bfo/README.rst b/bfo/README.rst index 6adc7f8..222871c 100644 --- a/bfo/README.rst +++ b/bfo/README.rst @@ -18,13 +18,15 @@ To update the boot images follow this manual process. Ensure the following dependencies are installed: :: + dnf groupinstall 'Development Tools' - dnf install syslinux-nonlinux xz-devel + dnf install syslinux-nonlinux xz-devel Clone the repos, patch for https and build: :: - git clone ssh://fasusername@git.fedorahosted.org/git/fedora-infrastructure.git + + git clone https://pagure.io/fedora-infrastructure.git cd fedora-infrastructure/bfo git clone git://git.ipxe.org/ipxe.git patch -p0 < ipxe_enable_https.patch @@ -34,6 +36,7 @@ Clone the repos, patch for https and build: Update the alt images from the following build artifacts: :: + bin/ipxe.iso bin/ipxe.dsk bin/ipxe.lkrn @@ -41,18 +44,20 @@ Update the alt images from the following build artifacts: Making Menu Changes -------------------- -Periodiclly we need to update the menu items. To update menu items follow this manual process. +Periodically we need to update the menu items. To update menu items follow this manual process. Clone the repo: :: - git clone ssh://fasusername@git.fedorahosted.org/git/fedora-infrastructure.git + + git clone https://pagure.io/fedora-infrastructure.git cd fedora-infrastructure/bfo/pxelinux.cfg Make the needed changes to the menu configurations in this directory. The menus are loaded in the following order (check default for the latest): :: + default - fedora_install.conf - fedora_rescue.conf @@ -65,6 +70,7 @@ The menus are loaded in the following order (check default for the latest): Commit and push your changes: :: + git commit -a git push origin @@ -77,7 +83,8 @@ To be able to test changes before publishing them, you can use Fedora People hos Clone the repos, patch for https, configure for your Fedora People and build: :: - git clone ssh://fasusername@git.fedorahosted.org/git/fedora-infrastructure.git + + git clone https://pagure.io/fedora-infrastructure.git cd fedora-infrastructure/bfo git clone git://git.ipxe.org/ipxe.git patch -p0 < ipxe_enable_https.patch @@ -99,6 +106,7 @@ Clone the repos, patch for https, configure for your Fedora People and build: Prepare your BFO dist: :: + mkdir bfo wget -P bfo https://alt.fedoraproject.org/pub/alt/bfo/pxelinux.0 \ https://alt.fedoraproject.org/pub/alt/bfo/vesainfo.c32 \ @@ -110,13 +118,13 @@ Prepare your BFO dist: Copy your BFO dist to Fedora People: :: + scp -r bfo fasusername@fedorapeople.org:public_html/ Boot the ipxe.iso: :: + qemu-kvm -m 2048 bin/ipxe.iso Interact with the menu items as needed for testing your changes. - - diff --git a/bfo/pxelinux.cfg/default b/bfo/pxelinux.cfg/default index d343a9e..e5b5b93 100644 --- a/bfo/pxelinux.cfg/default +++ b/bfo/pxelinux.cfg/default @@ -1,7 +1,7 @@ DEFAULT vesamenu.c32 MENU INCLUDE fedora.conf PROMPT 0 -MENU TITLE boot.fedoraproject.org (version 2018-04-02) +MENU TITLE boot.fedoraproject.org (version 2018-04-11) LABEL bootlocal MENU DEFAULT diff --git a/bfo/pxelinux.cfg/fedora_prerelease.conf b/bfo/pxelinux.cfg/fedora_prerelease.conf index ac3fa21..0a35a3a 100644 --- a/bfo/pxelinux.cfg/fedora_prerelease.conf +++ b/bfo/pxelinux.cfg/fedora_prerelease.conf @@ -8,27 +8,25 @@ ENDTEXT label Fedora-28-Beta-x86_64-Everything MENU LABEL Fedora-28-Beta-x86_64-Everything - kernel http://download.fedoraproject.org/pub/fedora/linux/releases/testing/28-Beta/Everything/x86_64/os/images/pxeboot/vmlinuz - initrd http://download.fedoraproject.org/pub/fedora/linux/releases/testing/28-Beta/Everything/x86_64/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/testing/28-Beta/Everything/x86_64/os/ rd.timeout=60 + kernel http://download.fedoraproject.org/pub/fedora/linux/releases/test/28_Beta/Everything/x86_64/os/images/pxeboot/vmlinuz + initrd http://download.fedoraproject.org/pub/fedora/linux/releases/test/28_Beta/Everything/x86_64/os/images/pxeboot/initrd.img + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/test/28_Beta/Everything/x86_64/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 28-Beta x86_64 Everything installer. ENDTEXT label Fedora-28-Beta-i386-Everything MENU LABEL Fedora-28-Beta-i386-Everything - kernel http://download.fedoraproject.org/pub/fedora/linux/releases/testing/28-Beta/Everything/i386/os/images/pxeboot/vmlinuz - initrd http://download.fedoraproject.org/pub/fedora/linux/releases/testing/28-Beta/Everything/i386/os/images/pxeboot/initrd.img - APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/testing/28-Beta/Everything/i386/os/ rd.timeout=60 + kernel http://download.fedoraproject.org/pub/fedora/linux/releases/test/28_Beta/Everything/i386/os/images/pxeboot/vmlinuz + initrd http://download.fedoraproject.org/pub/fedora/linux/releases/test/28_Beta/Everything/i386/os/images/pxeboot/initrd.img + APPEND repo=http://download.fedoraproject.org/pub/fedora/linux/releases/test/28_Beta/Everything/i386/os/ rd.timeout=60 TEXT HELP Selecting this will boot the Fedora 28-Beta i386 Everything installer. ENDTEXT label uplvl - IPAPPEND 3 MENU LABEL ^Back MENU EXIT label spacer MENU LABEL - diff --git a/bfo/pxelinux.cfg/fedora_rawhide.conf b/bfo/pxelinux.cfg/fedora_rawhide.conf index 490405b..bb3cfb9 100644 --- a/bfo/pxelinux.cfg/fedora_rawhide.conf +++ b/bfo/pxelinux.cfg/fedora_rawhide.conf @@ -12,7 +12,7 @@ label Fedora-rawhide-x86_64 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/ rd.timeout=60 TEXT HELP - Selecting this will boot the Fedora Rawhide x86_64 installer. + Selecting this will boot the Fedora Rawhide x86_64 installer. See: http://fedoraproject.org/wiki/Releases/Rawhide for more info ENDTEXT @@ -22,7 +22,7 @@ label Fedora-rawhide-i386 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/ rd.timeout=60 TEXT HELP - Selecting this will boot the Fedora Rawhide 32 bit installer. + Selecting this will boot the Fedora Rawhide 32 bit installer. See: http://fedoraproject.org/wiki/Releases/Rawhide for more info ENDTEXT @@ -47,10 +47,8 @@ label Fedora-rawhide-i386-rescue ENDTEXT label uplvl - IPAPPEND 3 MENU LABEL ^Back MENU EXIT label spacer MENU LABEL - diff --git a/bfo/pxelinux.cfg/utilities.conf b/bfo/pxelinux.cfg/utilities.conf index 4e3e74b..c0ec9f8 100644 --- a/bfo/pxelinux.cfg/utilities.conf +++ b/bfo/pxelinux.cfg/utilities.conf @@ -28,10 +28,8 @@ label memtest86+-4.20 ENDTEXT label uplvl - IPAPPEND 3 MENU LABEL ^Back MENU EXIT label spacer MENU LABEL - From 48ddd80150502baa11006ed7428bcced50abc634 Mon Sep 17 00:00:00 2001 From: Peter 'Pessoft' Kolínek Date: Apr 11 2018 19:17:04 +0000 Subject: [PATCH 2/2] fix git clone URLs for pagure --- diff --git a/bfo/README.rst b/bfo/README.rst index 222871c..c3853b9 100644 --- a/bfo/README.rst +++ b/bfo/README.rst @@ -26,7 +26,7 @@ Clone the repos, patch for https and build: :: - git clone https://pagure.io/fedora-infrastructure.git + git clone ssh://git@pagure.io/fedora-infrastructure.git cd fedora-infrastructure/bfo git clone git://git.ipxe.org/ipxe.git patch -p0 < ipxe_enable_https.patch @@ -50,7 +50,7 @@ Clone the repo: :: - git clone https://pagure.io/fedora-infrastructure.git + git clone ssh://git@pagure.io/fedora-infrastructure.git cd fedora-infrastructure/bfo/pxelinux.cfg Make the needed changes to the menu configurations in this directory. @@ -84,7 +84,7 @@ Clone the repos, patch for https, configure for your Fedora People and build: :: - git clone https://pagure.io/fedora-infrastructure.git + git clone ssh://git@pagure.io/fedora-infrastructure.git cd fedora-infrastructure/bfo git clone git://git.ipxe.org/ipxe.git patch -p0 < ipxe_enable_https.patch