From 371e59d27f23f69499ff696f0bf95569d69394b6 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 13 Apr 2012 16:27:20 -0700 Subject: [PATCH] remove unneeded dracut bootargs anaconda-dracut now adds these itself. --- share/config_files/ppc/yaboot.conf.in | 2 +- share/config_files/sparc/silo.conf | 6 +++--- share/config_files/x86/grub.conf | 2 +- share/config_files/x86/isolinux.cfg | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/config_files/ppc/yaboot.conf.in b/share/config_files/ppc/yaboot.conf.in index b59f507a..0a6bafc2 100644 --- a/share/config_files/ppc/yaboot.conf.in +++ b/share/config_files/ppc/yaboot.conf.in @@ -6,4 +6,4 @@ image=/ppc/ppc@BITS@/vmlinuz label=linux initrd=/ppc/ppc@BITS@/initrd.img read-only - append="@ROOT@ rd.luks=0 rd.md=0 rd.dm=0" + append="@ROOT@" diff --git a/share/config_files/sparc/silo.conf b/share/config_files/sparc/silo.conf index 30b01c4a..846c569b 100644 --- a/share/config_files/sparc/silo.conf +++ b/share/config_files/sparc/silo.conf @@ -6,13 +6,13 @@ message=/boot/boot.msg image[sun4u]=/boot/vmlinuz label=linux alias=install - append="@ROOT@ rd.luks=0 rd.md=0 rd.dm=0" + append="@ROOT@" initrd=/boot/initrd.img image[sun4u]=/boot/vmlinuz label=text - append="@ROOT@ text rd.luks=0 rd.md=0 rd.dm=0" + append="@ROOT@ text" initrd=/boot/initrd.img image[sun4u]=/boot/vmlinuz label=ks - append="@ROOT@ ks rd.luks=0 rd.md=0 rd.dm=0" + append="@ROOT@ ks" initrd=/boot/initrd.img diff --git a/share/config_files/x86/grub.conf b/share/config_files/x86/grub.conf index c8504ee6..c5802c76 100644 --- a/share/config_files/x86/grub.conf +++ b/share/config_files/x86/grub.conf @@ -5,5 +5,5 @@ timeout 5 hiddenmenu title @PRODUCT@ @VERSION@ findiso - kernel @KERNELPATH@ @ROOT@ rd.luks=0 rd.md=0 rd.dm=0 + kernel @KERNELPATH@ @ROOT@ initrd @INITRDPATH@ diff --git a/share/config_files/x86/isolinux.cfg b/share/config_files/x86/isolinux.cfg index 3cc225b7..0a8d7b65 100644 --- a/share/config_files/x86/isolinux.cfg +++ b/share/config_files/x86/isolinux.cfg @@ -60,7 +60,7 @@ label linux menu label ^Install or upgrade @PRODUCT@ menu default kernel vmlinuz - append initrd=initrd.img @ROOT@ quiet rd.luks=0 rd.md=0 rd.dm=0 + append initrd=initrd.img @ROOT@ quiet menu separator # insert an empty line # utilities submenu menu begin ^Troubleshooting @@ -73,7 +73,7 @@ label vesa @PRODUCT@. endtext kernel vmlinuz - append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet rd.luks=0 rd.md=0 rd.dm=0 + append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet label rescue menu indent count 5 menu label ^Rescue a @PRODUCT@ system.