[lorax-rhel7 2/2] drop dracut args from config files (#1008054)
Brian C. Lane
bcl at redhat.com
Sat Sep 14 01:02:01 UTC 2013
From: "Brian C. Lane" <bcl at redhat.com>
It no longer autoassembles things so we don't need to pass rd.md=0, etc.
---
share/live/config_files/x86/grub.conf | 4 ++--
share/live/config_files/x86/grub2-efi.cfg | 8 ++++----
share/live/config_files/x86/isolinux.cfg | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/share/live/config_files/x86/grub.conf b/share/live/config_files/x86/grub.conf
index 5afb1cd..3e28b37 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 Start @PRODUCT@ @VERSION@
findiso
- kernel @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 quiet
+ kernel @KERNELPATH@ @ROOT@ rd.live.image quiet
initrd @INITRDPATH@
title Test this media & start @PRODUCT@ @VERSION@
findiso
- kernel @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rd.live.check quiet
+ kernel @KERNELPATH@ @ROOT@ rd.live.image rd.live.check quiet
initrd @INITRDPATH@
diff --git a/share/live/config_files/x86/grub2-efi.cfg b/share/live/config_files/x86/grub2-efi.cfg
index 51a2bdb..dd595c1 100644
--- a/share/live/config_files/x86/grub2-efi.cfg
+++ b/share/live/config_files/x86/grub2-efi.cfg
@@ -21,20 +21,20 @@ search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ###
menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 quiet
+ linuxefi @KERNELPATH@ @ROOT@ rd.live.image quiet
initrdefi @INITRDPATH@
}
menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rd.live.check quiet
+ linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.live.check quiet
initrdefi @INITRDPATH@
}
submenu 'Troubleshooting -->' {
menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 xdriver=vesa nomodeset quiet
+ linuxefi @KERNELPATH@ @ROOT@ rd.live.image xdriver=vesa nomodeset quiet
initrdefi @INITRDPATH@
}
menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rescue quiet
+ linuxefi @KERNELPATH@ @ROOT@ rd.live.image rescue quiet
initrdefi @INITRDPATH@
}
}
diff --git a/share/live/config_files/x86/isolinux.cfg b/share/live/config_files/x86/isolinux.cfg
index 3a368a0..3612d81 100644
--- a/share/live/config_files/x86/isolinux.cfg
+++ b/share/live/config_files/x86/isolinux.cfg
@@ -61,13 +61,13 @@ menu separator # insert an empty line
label linux
menu label ^Start @PRODUCT@ @VERSION@
kernel vmlinuz
- append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 quiet
+ append initrd=initrd.img @ROOT@ rd.live.image quiet
label check
menu label Test this ^media & start @PRODUCT@ @VERSION@
menu default
kernel vmlinuz
- append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rd.live.check quiet
+ append initrd=initrd.img @ROOT@ rd.live.image rd.live.check quiet
menu separator # insert an empty line
@@ -83,7 +83,7 @@ label vesa
@PRODUCT@ @VERSION at .
endtext
kernel vmlinuz
- append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 xdriver=vesa nomodeset quiet
+ append initrd=initrd.img @ROOT@ rd.live.image xdriver=vesa nomodeset quiet
label rescue
menu indent count 5
@@ -93,7 +93,7 @@ label rescue
and edit config files to try to get it booting again.
endtext
kernel vmlinuz
- append initrd=initrd.img @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0 rescue quiet
+ append initrd=initrd.img @ROOT@ rd.live.image rescue quiet
label memtest
menu label Run a ^memory test
--
1.8.3.1
More information about the anaconda-patches
mailing list