almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: use rd.live.image instead of liveimg

Browse Source
This commit is contained in:
Brian C. Lane 2012-08-21 16:26:58 -07:00
parent 40d544c24b
commit 24c18233aa
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/fedora-livemedia.ks
View File

@ -50,7 +50,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
. /etc/init.d/functions . /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 exit 0
fi fi
@ -238,7 +238,7 @@ cat > /etc/rc.d/init.d/livesys-late << EOF
. /etc/init.d/functions . /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 exit 0
fi fi

4
share/live/config_files/x86/grub.conf
View File

@ -5,9 +5,9 @@ timeout 5
hiddenmenu hiddenmenu
title @PRODUCT@ @VERSION@ title @PRODUCT@ @VERSION@
findiso 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@ initrd @INITRDPATH@
title Test this media & start @PRODUCT@ title Test this media & start @PRODUCT@
findiso 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@ initrd @INITRDPATH@

4
share/live/config_files/x86/grub2-efi.cfg
View File

@ -21,11 +21,11 @@ search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/10_linux ###
menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { 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@ initrdefi @INITRDPATH@
} }
menuentry 'Test this media & start @PRODUCT@' --class fedora --class gnu-linux --class gnu --class os { 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@ initrdefi @INITRDPATH@
} }

6
share/live/config_files/x86/isolinux.cfg
View File

@ -60,11 +60,11 @@ label linux
menu label ^Start @PRODUCT@ (default) menu label ^Start @PRODUCT@ (default)
menu default menu default
kernel vmlinuz 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 label check
menu label Test this ^media & start @PRODUCT@ menu label Test this ^media & start @PRODUCT@
kernel vmlinuz 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 menu separator # insert an empty line
# utilities submenu # utilities submenu
menu begin ^Troubleshooting menu begin ^Troubleshooting
@ -77,7 +77,7 @@ label vesa
@PRODUCT@. @PRODUCT@.
endtext endtext
kernel vmlinuz 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 label memtest
menu label Run a ^memory test menu label Run a ^memory test
text help text help