From 914712156def4923bdb8919563bdd633dd2abc82 Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Thu, 10 Sep 2015 12:55:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BC=D1=83=D0=BB=D1=8C=D1=82=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BE=D1=87=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0_bootmenu/desktop.config.gfxboot                |  1 +
 .../gfxboot-themes-calculate/0-isolinux/gfxboot.cfg  | 12 +-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/profiles/templates/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot b/profiles/templates/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
index 1d432fbd3..66e50aa60 100644
--- a/profiles/templates/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
+++ b/profiles/templates/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
@@ -19,6 +19,7 @@ cl;
 #?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
 #-load(/bootmenu/bootparam.config)-# verbose;
 #pkg#
+
 #-livemenu(submenu)-#
 
 FOOTER
diff --git a/profiles/templates/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg b/profiles/templates/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
index 048084f1d..119fbb766 100644
--- a/profiles/templates/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
+++ b/profiles/templates/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg
@@ -5,34 +5,24 @@ hidden-timeout=0
 composite-labels=
 label auto=Auto
 append auto=
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
 label intel=Intel (intel)
 append intel=video:intel
 applies intel=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
 label radeon=Ati Radeon Open Source (radeon)
 append radeon=video:radeon
 applies radeon=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?cl_builder_videodrv_set==on#
 label fglrx=Ati Proprietary (fglrx)
 append fglrx=video:fglrx
 applies fglrx=#?cl_builder_videodrv_set==on#cl #cl_builder_videodrv_set##-livemenu(video)-#
-#cl_builder_videodrv_set#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
 label nv=Nvidia 2D only (nv)
 append nv=video:nv
-applies nv=#pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
+applies nv=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
 label nouveau=Nvidia Open Source (nouveau)
 append nouveau=video:nouveau
 applies nouveau=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#
-#?cl_builder_videodrv_set==on#
 label nvidia=Nvidia Proprietary (nvidia)
 append nvidia=video:nvidia
 applies nvidia=#?cl_builder_videodrv_set==on#cl #cl_builder_videodrv_set##-livemenu(video)-#
-#cl_builder_videodrv_set#
-#?pkg(x11-base/xorg-server)!=||livemenu(xorg)!=#
 label vesa=Generic Vesa (vesa)
 append vesa=video:vesa,composite:off
 applies vesa=#?pkg(x11-base/xorg-server)!=#cl #pkg##-livemenu(xorg)-#
-#pkg#