about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2013-05-20 15:57:37 +0200
committerJuan RP <xtraeme@gmail.com>2013-05-20 15:57:37 +0200
commitb557955207e181c1e00e089ec5bbaa3d393002a5 (patch)
tree9fc78ee72a463fb4f4303be74d820f7b3396a1b2
parent997b3ca895583541a3aa40a95d9e188419279c8f (diff)
downloadhrmpf-b557955207e181c1e00e089ec5bbaa3d393002a5.tar.gz
hrmpf-b557955207e181c1e00e089ec5bbaa3d393002a5.tar.xz
hrmpf-b557955207e181c1e00e089ec5bbaa3d393002a5.zip
Update grub/isolinux kernel cmdline: remove useless args.
-rw-r--r--grub/grub_void.cfg.in4
-rw-r--r--isolinux/isolinux.cfg.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/grub/grub_void.cfg.in b/grub/grub_void.cfg.in
index 47be169..8f84fe5 100644
--- a/grub/grub_void.cfg.in
+++ b/grub/grub_void.cfg.in
@@ -28,9 +28,9 @@ if [ cpuid -l ]; then
     menuentry "Void GNU/Linux @@KERNVER@@ (@@ARCH@@)" {
         set gfxpayload="keep"
         linux (${voidlive})/boot/vmlinuz \
-		root=live:CDLABEL=VOID_LIVE ro rootfstype=auto \
+		root=live:CDLABEL=VOID_LIVE ro \
 		rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 gpt add_efi_memmap \
-		vconsole.keymap=@@KEYMAP@@ vconsole.unicode=1 locale.LANG=@@LOCALE@@
+		vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@
         initrd (${voidlive})/boot/initrd.lz
     }
 fi
diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in
index 106bd0f..86ff53a 100644
--- a/isolinux/isolinux.cfg.in
+++ b/isolinux/isolinux.cfg.in
@@ -23,7 +23,7 @@ MENU COLOR sel          * #ffffffff #FF5255FF *
 LABEL linux
 MENU LABEL Boot Void GNU/Linux @@KERNVER@@ @@ARCH@@
 KERNEL /boot/vmlinuz
-APPEND initrd=/boot/initrd.lz root=live:CDLABEL=VOID_LIVE rootfstype=auto ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.keymap=@@KEYMAP@@ vconsole.unicode=1 locale.LANG=@@LOCALE@@
+APPEND initrd=/boot/initrd.lz root=live:CDLABEL=VOID_LIVE ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@
 LABEL c
 MENU LABEL Boot first HD found by BIOS
 COM32 chain.c32