From: "Brian C. Lane" <bcl(a)redhat.com>
---
share/live/config_files/x86/grub2-efi.cfg | 31 +++++++++++++++++++++++++++++++
share/live/efi.tmpl | 13 +++++++++----
share/live/x86.tmpl | 4 ++--
3 files changed, 42 insertions(+), 6 deletions(-)
create mode 100644 share/live/config_files/x86/grub2-efi.cfg
diff --git a/share/live/config_files/x86/grub2-efi.cfg
b/share/live/config_files/x86/grub2-efi.cfg
new file mode 100644
index 0000000..f21d085
--- /dev/null
+++ b/share/live/config_files/x86/grub2-efi.cfg
@@ -0,0 +1,31 @@
+set default="0"
+
+function load_video {
+ insmod efi_gop
+ insmod efi_uga
+ insmod video_bochs
+ insmod video_cirrus
+ insmod all_video
+}
+
+load_video
+set gfxpayload=keep
+insmod gzio
+insmod part_gpt
+insmod ext2
+
+set timeout=5
+### END /etc/grub.d/00_header ###
+
+search --no-floppy --set=root -l '@ISOLABEL@'
+
+### BEGIN /etc/grub.d/10_linux ###
+menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu
--class os {
+ linuxefi @KERNELPATH@ @ROOT@
+ initrdefi @INITRDPATH@
+}
+menuentry 'Test this media & start @PRODUCT@' --class fedora --class
gnu-linux --class gnu --class os {
+ linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.check
+ initrdefi @INITRDPATH@
+}
+
diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl
index 644f009..7664d90 100644
--- a/share/live/efi.tmpl
+++ b/share/live/efi.tmpl
@@ -1,4 +1,4 @@
-<%page args="configdir, KERNELDIR, efiarch"/>
+<%page args="configdir, KERNELDIR, efiarch, isolabel"/>
<%
EFIBOOTDIR="EFI/BOOT"
APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns"
@@ -6,7 +6,10 @@
APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
%>
mkdir ${EFIBOOTDIR}
-install boot/efi/EFI/redhat/grub.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
+mkdir ${EFIBOOTDIR}/fonts/
+install boot/efi/EFI/fedora/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
+install boot/efi/EFI/fedora/grub-cd.efi ${EFIBOOTDIR}/grubx64.efi
+install boot/efi/EFI/fedora/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
install boot/grub/splash.xpm.gz ${EFIBOOTDIR}
## actually make the EFI images
@@ -19,7 +22,7 @@ ${make_efiboot("images/efiboot.img")}
<%def name="make_efiboot(img, include_kernel=False, disk=False,
imgtype='default')">
<%
kdir = EFIBOOTDIR if include_kernel else KERNELDIR
- eficonf = "%s/BOOT%s.conf" % (EFIBOOTDIR, efiarch)
+ eficonf = "%s/grub.cfg" % (EFIBOOTDIR, )
args = "--label=ANACONDA"
if disk: args += " --disk"
if imgtype == "apple": args += ' --apple --icon=%s --diskname=%s
--product="%s %s"' % (APPLE_EFI_ICON, APPLE_EFI_DISKNAME, product.name,
product.version)
@@ -28,12 +31,14 @@ ${make_efiboot("images/efiboot.img")}
copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR}
copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
%endif
- install ${configdir}/grub.conf ${eficonf}
+ install ${configdir}/grub2-efi.cfg ${eficonf}
replace @PRODUCT@ '${product.name}' ${eficonf}
replace @VERSION@ ${product.version} ${eficonf}
+ replace @KERNELNAME@ vmlinuz ${eficonf}
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}
replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf}
+ replace @ISOLABEL@ '${isolabel}' ${eficonf}
%if disk:
## FIXME: using root= causes problems with product.img (see bug 811979)
replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl
index 023c1af..107ed05 100644
--- a/share/live/x86.tmpl
+++ b/share/live/x86.tmpl
@@ -49,7 +49,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
## WHeeeeeeee, EFI.
## We could remove the basearch restriction someday..
<% efiargs=""; efigraft=""; efihybrid="" %>
-%if exists("boot/efi/EFI/redhat/grub.efi") and basearch != 'i386':
+%if exists("boot/efi/EFI/fedora/grub-cd.efi") and basearch != 'i386':
<%
efiarch = 'X64' if basearch=='x86_64' else 'IA32'
efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
@@ -61,7 +61,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
efigraft += " {0}={1}/{0}".format(img,outroot)
efihybrid = "--uefi --mac" if domacboot else "--uefi"
%>
- <%include file="efi.tmpl" args="configdir=configdir,
KERNELDIR=KERNELDIR, efiarch=efiarch"/>
+ <%include file="efi.tmpl" args="configdir=configdir,
KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
%endif
## make boot.iso
--
1.7.11.2
Show replies by date
From: "Brian C. Lane" <bcl(a)redhat.com>
---
docs/fedora-livemedia.ks | 4 ++--
share/live/config_files/x86/grub.conf | 4 ++--
share/live/config_files/x86/grub2-efi.cfg | 4 ++--
share/live/config_files/x86/isolinux.cfg | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks
index 5e81c4c..2f84142 100644
--- a/docs/fedora-livemedia.ks
+++ b/docs/fedora-livemedia.ks
@@ -50,7 +50,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
. /etc/init.d/functions
-if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" !=
"start" ]; then
+if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" !=
"start" ]; then
exit 0
fi
@@ -238,7 +238,7 @@ cat > /etc/rc.d/init.d/livesys-late << EOF
. /etc/init.d/functions
-if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" !=
"start" ] || [ -e /.liveimg-late-configured ] ; then
+if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" !=
"start" ] || [ -e /.liveimg-late-configured ] ; then
exit 0
fi
diff --git a/share/live/config_files/x86/grub.conf
b/share/live/config_files/x86/grub.conf
index 3547540..b7fdf82 100644
--- a/share/live/config_files/x86/grub.conf
+++ b/share/live/config_files/x86/grub.conf
@@ -5,9 +5,9 @@ timeout 5
hiddenmenu
title @PRODUCT@ @VERSION@
findiso
- kernel @KERNELPATH@ @ROOT@ liveimg rd.luks=0 rd.md=0 rd.dm=0
+ kernel @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0
initrd @INITRDPATH@
title Test this media & start @PRODUCT@
findiso
- kernel @KERNELPATH@ @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
+ kernel @KERNELPATH@ @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0 rd.dm=0
initrd @INITRDPATH@
diff --git a/share/live/config_files/x86/grub2-efi.cfg
b/share/live/config_files/x86/grub2-efi.cfg
index f21d085..6dea0aa 100644
--- a/share/live/config_files/x86/grub2-efi.cfg
+++ b/share/live/config_files/x86/grub2-efi.cfg
@@ -21,11 +21,11 @@ search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ###
menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu
--class os {
- linuxefi @KERNELPATH@ @ROOT@
+ linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.image rd.luks=0 rd.md=0 rd.dm=0
initrdefi @INITRDPATH@
}
menuentry 'Test this media & start @PRODUCT@' --class fedora --class
gnu-linux --class gnu --class os {
- linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.check
+ linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0
rd.dm=0
initrdefi @INITRDPATH@
}
diff --git a/share/live/config_files/x86/isolinux.cfg
b/share/live/config_files/x86/isolinux.cfg
index e158834..cb20bb4 100644
--- a/share/live/config_files/x86/isolinux.cfg
+++ b/share/live/config_files/x86/isolinux.cfg
@@ -60,11 +60,11 @@ label linux
menu label ^Start @PRODUCT@ (default)
menu default
kernel vmlinuz
- append initrd=initrd.img @ROOT@ quiet liveimg rd.luks=0 rd.md=0 rd.dm=0
+ append initrd=initrd.img @ROOT@ quiet rd.live.image rd.luks=0 rd.md=0 rd.dm=0
label check
menu label Test this ^media & start @PRODUCT@
kernel vmlinuz
- append initrd=initrd.img @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
+ append initrd=initrd.img @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0
rd.dm=0
menu separator # insert an empty line
# utilities submenu
menu begin ^Troubleshooting
@@ -77,7 +77,7 @@ label vesa
@PRODUCT@.
endtext
kernel vmlinuz
- append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet liveimg rd.luks=0 rd.md=0
rd.dm=0
+ append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet rd.live.image rd.luks=0
rd.md=0 rd.dm=0
label memtest
menu label Run a ^memory test
text help
--
1.7.11.2
On 08/21/2012 05:21 PM, Brian C. Lane wrote:
From: "Brian C. Lane"<bcl(a)redhat.com>
Ack to both of these, with the note on IRC about changing grub-cd name.
--
Jesse Keating
Fedora -- FreedomĀ² is a feature!