From 270b31729d4012ae1b6ab5f54cebfecc052f2bc8 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 8 Apr 2011 15:59:56 +0400 Subject: [PATCH] Update grub.conf templates for use fb_resolution. --- install/1system/grub/grub.conf | 12 ++++++------ install/1system/grub/grub.conf.oldkernel | 12 ++++++------ install/1system/grub/grub.conf.scratch | 12 ++++++------ install/1system/grub/grub.conf.scratch.oldkernel | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/install/1system/grub/grub.conf b/install/1system/grub/grub.conf index d001b98..ace91c4 100644 --- a/install/1system/grub/grub.conf +++ b/install/1system/grub/grub.conf @@ -15,13 +15,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-# @@ -36,13 +36,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-#-install diff --git a/install/1system/grub/grub.conf.oldkernel b/install/1system/grub/grub.conf.oldkernel index 822159e..7e5f933 100644 --- a/install/1system/grub/grub.conf.oldkernel +++ b/install/1system/grub/grub.conf.oldkernel @@ -15,13 +15,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-# @@ -36,13 +36,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-#-install diff --git a/install/1system/grub/grub.conf.scratch b/install/1system/grub/grub.conf.scratch index cb8a17a..cf7e3e7 100644 --- a/install/1system/grub/grub.conf.scratch +++ b/install/1system/grub/grub.conf.scratch @@ -15,13 +15,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-# @@ -36,13 +36,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-#-install diff --git a/install/1system/grub/grub.conf.scratch.oldkernel b/install/1system/grub/grub.conf.scratch.oldkernel index 02f8e8f..8d26034 100644 --- a/install/1system/grub/grub.conf.scratch.oldkernel +++ b/install/1system/grub/grub.conf.scratch.oldkernel @@ -15,13 +15,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-# @@ -36,13 +36,13 @@ title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_v #os_install_linux_system# root (hd#-disk(/boot,grub)-#) #?os_install_linux_system==desktop# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_system==server&&os_install_linux_shortname!=CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_system# #?os_install_linux_shortname==CSS# -kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,1024x768-32@60,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# +kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# #os_install_linux_shortname# initrd /boot/initrd-#-cl_install_kernel_uid-#-install