From a2dfa53012dd6bcc3c057f824e2a0fb0c9c7ba90 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 20 Jul 2011 16:15:04 +0400 Subject: [PATCH] Remove calculate=video: from cmdline in usb-hdd. --- install/1merge/grub2/default.grub | 5 +--- install/1merge/grub2/default.grub.usbhdd | 29 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 install/1merge/grub2/default.grub.usbhdd diff --git a/install/1merge/grub2/default.grub b/install/1merge/grub2/default.grub index f7c271b..8b859a8 100644 --- a/install/1merge/grub2/default.grub +++ b/install/1merge/grub2/default.grub @@ -1,4 +1,4 @@ -# Calculate format=openrc path=/etc/default name=grub +# Calculate format=openrc path=/etc/default name=grub os_install_root_type!=usb-hdd GRUB_DISABLE_RECOVERY=true GRUB_DEFAULT=saved GRUB_TIMEOUT=3 @@ -26,6 +26,3 @@ GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder" #?os_install_linux_subname!=&&os_install_scratch==on# GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder" #os_install_linux_subname# -#?os_install_root_type==usb-hdd# -GRUB_DISABLE_OS_PROBER=true -#os_install_root_type# diff --git a/install/1merge/grub2/default.grub.usbhdd b/install/1merge/grub2/default.grub.usbhdd new file mode 100644 index 0000000..3764977 --- /dev/null +++ b/install/1merge/grub2/default.grub.usbhdd @@ -0,0 +1,29 @@ +# Calculate format=openrc path=/etc/default name=grub os_install_root_type==usb-hdd +GRUB_DISABLE_RECOVERY=true +GRUB_DEFAULT=saved +GRUB_TIMEOUT=3 +#?pkg(media-gfx/cld-themes)!=||pkg(media-gfx/cldx-themes)!=||pkg(media-gfx/cldg-themes)!=||pkg(media-gfx/cls-themes)!=||pkg(media-gfx/cds-themes)!=||pkg(media-gfx/cmc-themes)!=# +GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# console=tty1 udev quiet" +#pkg# +#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==# +GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# console=tty1 udev quiet" +#pkg# +!GRUB_TERMINAL=del +GRUB_GFXMODE="1024x768" +GRUB_BACKGROUND="/boot/grub/grub-calculate.png" +GRUB_COLOR_NORMAL="white/black" +GRUB_COLOR_HIGHLIGHT="magenta/black" +GRUB_VIDEO_BACKEND="vbe" +#?os_install_linux_subname==&&os_install_scratch==off# +GRUB_DISTRIBUTOR="#-os_install_linux_name-#" +#os_install_linux_subname# +#?os_install_linux_subname!=&&os_install_scratch==off# +GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#" +#os_install_linux_subname# +#?os_install_linux_subname==&&os_install_scratch==on# +GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder" +#os_install_linux_subname# +#?os_install_linux_subname!=&&os_install_scratch==on# +GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder" +#os_install_linux_subname# +GRUB_DISABLE_OS_PROBER=true