Добавлена настройка nomodeset для серверных сборок

profiles/templates/3.6/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg

@@ -13,6 +13,9 @@ label auto=Auto
 #?pkg(media-gfx/gfxboot-themes-calculate)>=17&&pkg(media-sound/pulseaudio)!=#
 audio=true
 #pkg#
+#?pkg(x11-base/xorg/server)==#
+nomodeset=true
+#pkg#
 append auto=
 #?livemenu(xorg)!=||pkg(x11-base/xorg-server)!=#
 label radeon=AMD Radeon (radeon)

profiles/templates/3.6/6_ac_builder_iso/5_setup/sys-boot/grub/grub.cfg

@@ -13,7 +13,7 @@
    echo "Audio: ${bootaudio}"
    echo "Bootparams: ${bootparams}"
    echo "Please wait..."
-   linux \3 \4 \6 #?cl_ver>=3.6.7.41##-cl_builder_boot_params-##cl_ver# ${bootparams} ${noefi_opt} ${no_gfxmode}
+   linux \3 \4 \6 #?cl_ver>=3.6.7.41##-cl_builder_boot_params-##cl_ver# ${bootparams} ${nomodeset_opt} ${noefi_opt} ${no_gfxmode}
    initrd \5
 }
 </text>
@@ -80,6 +80,15 @@ if [ x$noefi_opt = x ]; then
    export noefi_opt
 fi
 
+if [ "x$nomodeset_opt" = "x" ]; then
+#?pkg(x11-base/xorg-server)==#
+   nomodeset_opt='nomodeset'
+#!pkg#
+   nomodeset_opt=''
+#pkg#
+   export nomodeset_opt
+fi
+
 bootparams=calculate=
 
 if [ x$bootlang != x ]
@@ -155,6 +164,14 @@ submenu "Advanced Options" {
       export noefi_opt
       configfile /boot/grub/grub.cfg
    }
+#?pkg(x11-base/xorg-server)==#
+   menuentry "Enable modesetting" {
+      echo "Enabling modesetting..."
+      set nomodeset_opt=" "
+      export nomodeset_opt
+      configfile /boot/grub/grub.cfg
+   }
+#pkg#
 }
 
 if [ x$no_gfxmode = x ]; then