Fix select video drivers.

builder/iso/calcboot/isolinux/video.cfg

@@ -13,17 +13,17 @@ LABEL auto
 ENDTEXT
 
 LABEL intel
-        MENU LABEL Intel (intel)
+        MENU LABEL Intel (intel) with composite
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,intel,nocomposite
+        APPEND vga.cfg calculate=,,,,intel,composite
 
 LABEL intel
-        MENU LABEL Intel with composite (intel)
+        MENU LABEL Intel (intel)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,intel,composite
+        APPEND vga.cfg calculate=,,,,intel,nocomposite
 
 LABEL radeon
-        MENU LABEL ATI Radeon Open Source(radeon)
+        MENU LABEL ATI Radeon Open Source (radeon)
         KERNEL calcmenu.c32
         APPEND vga.cfg calculate=,,,,radeon,nocomposite
 
@@ -34,7 +34,7 @@ LABEL fglrx
         APPEND vga.cfg calculate=,,,,fglrx,nocomposite
 
 LABEL fglrx
-        MENU LABEL Ati proprietary with composite (fglrx)
+        MENU LABEL Ati proprietary (fglrx) with composite
         KERNEL calcmenu.c32
         APPEND vga.cfg calculate=,,,,fglrx,composite
 
@@ -44,26 +44,26 @@ LABEL nv
         KERNEL calcmenu.c32
         APPEND vga.cfg calculate=,,,,nv,nocomposite
 
+LABEL nouveaucomp
+        MENU LABEL Nvidia Open Source (nouveau) with composite
+        KERNEL calcmenu.c32
+        APPEND vga.cfg calculate=,,,,nouveau,composite
+
 LABEL nouveau
         MENU LABEL Nvidia Open Source (nouveau)
         KERNEL calcmenu.c32
         APPEND vga.cfg calculate=,,,,nouveau,nocomposite
 
-LABEL nouveaucomp
-        MENU LABEL Nvidia Open Source with composite (nouveau)
+#?os_builder_linux_shortname!=CLS#
+LABEL nvidiacomp
+        MENU LABEL NVIDIA Proprietary (nvidia) with composite
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nouveau,composite
+        APPEND vga.cfg calculate=,,,,nvidia,composite
 
-#?os_builder_linux_shortname!=CLS#
 LABEL nvidia
         MENU LABEL NVIDIA Proprietary (nvidia)
         KERNEL calcmenu.c32
         APPEND vga.cfg calculate=,,,,nvidia,nocomposite
-
-LABEL nvidiacomp
-        MENU LABEL NVIDIA Proprietary with composite (nvidia)
-        KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nvidia,composite
 #os_builder_linux_shortname#
 
 LABEL vesa