#6849 BFO fixes of F28-Beta, IPAPPEND and README.rst
Merged 5 years ago by kevin. Opened 5 years ago by pessoft.
pessoft/fedora-infrastructure fixes  into  master

fix git clone URLs for pagure
Peter 'Pessoft' Kolínek • 5 years ago  
fix f28 paths
Peter 'Pessoft' Kolínek • 5 years ago  
file modified
+15 -7
@@ -18,13 +18,15 @@ 

  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 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
@@ -34,6 +36,7 @@ 

  Update the alt images from the following build artifacts:

  

  ::

+ 

    bin/ipxe.iso

    bin/ipxe.dsk

    bin/ipxe.lkrn
@@ -41,18 +44,20 @@ 

  

  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 ssh://git@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 @@ 

  Commit and push your changes:

  

  ::

+ 

    git commit -a

    git push origin

  
@@ -77,7 +83,8 @@ 

  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 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
@@ -99,6 +106,7 @@ 

  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 @@ 

  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.

- 

- 

file modified
+1 -1
@@ -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

@@ -8,27 +8,25 @@ 

  

  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

- 

@@ -12,7 +12,7 @@ 

          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 @@ 

          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 @@ 

          ENDTEXT

  

  label uplvl

- 	IPAPPEND 3

          MENU LABEL ^Back

          MENU EXIT

  

  label spacer

          MENU LABEL

- 

@@ -28,10 +28,8 @@ 

          ENDTEXT

  

  label uplvl

- 	IPAPPEND 3

          MENU LABEL ^Back

          MENU EXIT

  

  label spacer

          MENU LABEL

- 

fix f28 paths
remove IPAPPEND from some back menu items
fix README.rst code blocks and Git repository URLs

Pull-Request has been merged by kevin

5 years ago