Convert to new calculate params.

builder/iso/calcboot/isolinux/keymap.cfg

@@ -5,93 +5,93 @@ INCLUDE common.cfg
 
 MENUPARAM calculate 1
 
-LABEL en_US
+LABEL keymap:en_US
 	MENU LABEL English,USA
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,en_US
+	APPEND isolinux.cfg calculate=,keymap:en_US
 
-LABEL en_GB
+LABEL keymap:en_GB
 	MENU LABEL English,GB
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,en_GB
+	APPEND isolinux.cfg calculate=,keymap:en_GB
 
-LABEL be_BY
+LABEL keymap:be_BY
 	MENU LABEL Belarusian
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,be_BY
+	APPEND isolinux.cfg calculate=,keymap:be_BY
 
-LABEL pt_BR
+LABEL keymap:pt_BR
 	MENU LABEL Brazilian
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,pt_BR
+	APPEND isolinux.cfg calculate=,keymap:pt_BR
 
-LABEL bg_BG
+LABEL keymap:bg_BG
 	MENU LABEL Bulgarian
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,bg_BG
+	APPEND isolinux.cfg calculate=,keymap:bg_BG
 
-LABEL da_DK
+LABEL keymap:da_DK
 	MENU LABEL Danish
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,da_DK
+	APPEND isolinux.cfg calculate=,keymap:da_DK
 
-LABEL fr_BE
+LABEL keymap:fr_BE
 	MENU LABEL Belgium
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,fr_BE
+	APPEND isolinux.cfg calculate=,keymap:fr_BE
 
-LABEL fr_FR
+LABEL keymap:fr_FR
 	MENU LABEL French
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,fr_FR
+	APPEND isolinux.cfg calculate=,keymap:fr_FR
 
-LABEL fr_CA
+LABEL keymap:fr_CA
 	MENU LABEL French,Canada
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,fr_CA
+	APPEND isolinux.cfg calculate=,keymap:fr_CA
 
-LABEL de_DE
+LABEL keymap:de_DE
 	MENU LABEL German
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,de_DE
+	APPEND isolinux.cfg calculate=,keymap:de_DE
 
-LABEL is_IS
+LABEL keymap:is_IS
 	MENU LABEL Icelandic
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,is_IS
+	APPEND isolinux.cfg calculate=,keymap:is_IS
 
-LABEL it_IT
+LABEL keymap:it_IT
 	MENU LABEL Italian
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,it_IT
+	APPEND isolinux.cfg calculate=,keymap:it_IT
 
-LABEL nn_NO
+LABEL keymap:nn_NO
 	MENU LABEL Norwegian,Nynorsk
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,nn_NO
+	APPEND isolinux.cfg calculate=,keymap:nn_NO
 
-LABEL pl_PL
+LABEL keymap:pl_PL
 	MENU LABEL Polish
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,pl_PL
+	APPEND isolinux.cfg calculate=,keymap:pl_PL
 
-LABEL ru_RU
+LABEL keymap:ru_RU
 	MENU LABEL Russian
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,ru_RU
+	APPEND isolinux.cfg calculate=,keymap:ru_RU
 
-LABEL es_ES
+LABEL keymap:es_ES
 	MENU LABEL Spanish
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,es_ES
+	APPEND isolinux.cfg calculate=,keymap:es_ES
 
-LABEL sv_SE
+LABEL keymap:sv_SE
 	MENU LABEL Swedish
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,sv_SE
+	APPEND isolinux.cfg calculate=,keymap:sv_SE
 
-LABEL uk_UA
+LABEL keymap:uk_UA
 	MENU LABEL Ukrainian
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,uk_UA
+	APPEND isolinux.cfg calculate=,keymap:uk_UA
 

builder/iso/calcboot/isolinux/lang.cfg

@@ -5,53 +5,53 @@ INCLUDE common.cfg
 
 MENUPARAM calculate 0
 
-LABEL en_US
+LABEL lang:en_US
         MENU LABEL American English
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=en_US,en_US,Canada/Pacific
+        APPEND isolinux.cfg calculate=lang:en_US,keymap:en_US,timezone:Canada/Pacific
 
-LABEL pt_BR
+LABEL lang:pt_BR
         MENU LABEL Brazilian Portuguese
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=pt_BR,pt_BR,America/Sao_Paulo
+        APPEND isolinux.cfg calculate=lang:pt_BR,keymap:pt_BR,timezone:America/Sao_Paulo
 
-LABEL bg_BG
+LABEL lang:bg_BG
         MENU LABEL Bulgarian
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=bg_BG,bg_BG,Europe/Sofia
+        APPEND isolinux.cfg calculate=lang:bg_BG,keymap:bg_BG,timezone:Europe/Sofia
 
-LABEL de_DE
+LABEL lang:de_DE
         MENU LABEL Deutsch
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=de_DE,de_DE,Europe/Amsterdam
+        APPEND isolinux.cfg calculate=lang:de_DE,keymap:de_DE,timezone:Europe/Amsterdam
 
-LABEL fr_FR
+LABEL lang:fr_FR
         MENU LABEL Francais
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=fr_FR,fr_FR,Europe/Brussels
+        APPEND isolinux.cfg calculate=lang:fr_FR,keymap:fr_FR,timezone:Europe/Brussels
 
-LABEL it_IT
+LABEL lang:it_IT
         MENU LABEL Italian
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=it_IT,it_IT,Europe/Amsterdam
+        APPEND isolinux.cfg calculate=lang:it_IT,keymap:it_IT,timezone:Europe/Amsterdam
 
-LABEL pl_PL
+LABEL lang:pl_PL
         MENU LABEL Polish
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=pl_PL,pl_PL,Europe/Belgrade
+        APPEND isolinux.cfg calculate=lang:pl_PL,keymap:pl_PL,timezone:Europe/Belgrade
 
-LABEL ru_RU
+LABEL lang:ru_RU
         MENU LABEL Russian
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=ru_RU,ru_RU,Europe/Moscow
+        APPEND isolinux.cfg calculate=lang:ru_RU,keymap:ru_RU,timezone:Europe/Moscow
 
-LABEL es_ES
+LABEL lang:es_ES
         MENU LABEL Espanol
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=es_ES,es_ES,Europe/Brussels
+        APPEND isolinux.cfg calculate=lang:es_ES,keymap:es_ES,timezone:Europe/Brussels
 
-LABEL uk_UA
+LABEL lang:uk_UA
         MENU LABEL Ukrainian
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=uk_UA,uk_UA,Europe/Kiev
+        APPEND isolinux.cfg calculate=lang:uk_UA,keymap:uk_UA,timezone:Europe/Kiev
 

builder/iso/calcboot/isolinux/timezone.cfg

@@ -5,437 +5,437 @@ INCLUDE common.cfg
 
 MENUPARAM calculate 2
 
-LABEL Etc/GMT-12
+LABEL timezone:Etc/GMT-12
 	MENU LABEL (GMT-12:00) International Date Line West
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Etc/GMT-12
+	APPEND isolinux.cfg calculate=,,timezone:Etc/GMT-12
 
-LABEL Pacific/Midway
+LABEL timezone:Pacific/Midway
 	MENU LABEL (GMT-11:00) Midway Island,Samoa
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Pacific/Midway
+	APPEND isolinux.cfg calculate=,,timezone:Pacific/Midway
 
-LABEL Pacific/Honolulu
+LABEL timezone:Pacific/Honolulu
 	MENU LABEL (GMT-10:00) Hawaii
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Pacific/Honolulu
+	APPEND isolinux.cfg calculate=,,timezone:Pacific/Honolulu
 
-LABEL America/Anchorage
+LABEL timezone:America/Anchorage
 	MENU LABEL (GMT-09:00) Alaska
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Anchorage
+	APPEND isolinux.cfg calculate=,,timezone:America/Anchorage
 
-LABEL Canada/Pacific
+LABEL timezone:Canada/Pacific
 	MENU LABEL (GMT-08:00) Pacific Time (US & Canada)
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Canada/Pacific
+	APPEND isolinux.cfg calculate=,,timezone:Canada/Pacific
 
-LABEL America/Tijuana
+LABEL timezone:America/Tijuana
 	MENU LABEL (GMT-08:00) Tijuana,Baja California
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Tijuana
+	APPEND isolinux.cfg calculate=,,timezone:America/Tijuana
 
-LABEL America/Phoenix
+LABEL timezone:America/Phoenix
 	MENU LABEL (GMT-07:00) Arizona
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Phoenix
+	APPEND isolinux.cfg calculate=,,timezone:America/Phoenix
 
-LABEL America/Denver
+LABEL timezone:America/Denver
 	MENU LABEL (GMT-07:00) Mountain Time (US & Canada)
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Denver
+	APPEND isolinux.cfg calculate=,,timezone:America/Denver
 
-LABEL America/Mazatlan
+LABEL timezone:America/Mazatlan
 	MENU LABEL (GMT-07:00) Chihuahua,La Paz,Mazatlan - New
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Mazatlan
+	APPEND isolinux.cfg calculate=,,timezone:America/Mazatlan
 
-LABEL America/Mazatlan
+LABEL timezone:America/Mazatlan
 	MENU LABEL (GMT-07:00) Chihuahua,La Paz,Mazatlan - Old
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Mazatlan
+	APPEND isolinux.cfg calculate=,,timezone:America/Mazatlan
 
-LABEL America/Monterrey
+LABEL timezone:America/Monterrey
 	MENU LABEL (GMT-06:00) Guadalajara,Mexico City,Monterrey - New
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Monterrey
+	APPEND isolinux.cfg calculate=,,timezone:America/Monterrey
 
-LABEL America/Monterrey
+LABEL timezone:America/Monterrey
 	MENU LABEL (GMT-06:00) Guadalajara,Mexico City,Monterrey - Old
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Monterrey
+	APPEND isolinux.cfg calculate=,,timezone:America/Monterrey
 
-LABEL America/Regina
+LABEL timezone:America/Regina
 	MENU LABEL (GMT-06:00) Saskatchewan
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Regina
+	APPEND isolinux.cfg calculate=,,timezone:America/Regina
 
-LABEL America/Mexico_City
+LABEL timezone:America/Mexico_City
 	MENU LABEL (GMT-06:00) Central America
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Mexico_City
+	APPEND isolinux.cfg calculate=,,timezone:America/Mexico_City
 
-LABEL Canada/Central
+LABEL timezone:Canada/Central
 	MENU LABEL (GMT-06:00) Central Time (US & Canada)
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Canada/Central
+	APPEND isolinux.cfg calculate=,,timezone:Canada/Central
 
-LABEL America/Bogota
+LABEL timezone:America/Bogota
 	MENU LABEL (GMT-05:00) Bogota,Lima,Quito,Rio Branco
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Bogota
+	APPEND isolinux.cfg calculate=,,timezone:America/Bogota
 
-LABEL America/New_York
+LABEL timezone:America/New_York
 	MENU LABEL (GMT-05:00) Eastern Time (US & Canada)
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/New_York
+	APPEND isolinux.cfg calculate=,,timezone:America/New_York
 
-LABEL America/Indiana/Indianapolis
+LABEL timezone:America/Indiana/Indianapolis
 	MENU LABEL (GMT-05:00) Indiana (East)
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Indiana/Indianapolis
+	APPEND isolinux.cfg calculate=,,timezone:America/Indiana/Indianapolis
 
-LABEL America/Halifax
+LABEL timezone:America/Halifax
 	MENU LABEL (GMT-04:00) Atlantic Time (Canada)
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Halifax
+	APPEND isolinux.cfg calculate=,,timezone:America/Halifax
 
-LABEL America/Caracas
+LABEL timezone:America/Caracas
 	MENU LABEL (GMT-04:00) Caracas,La Paz
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Caracas
+	APPEND isolinux.cfg calculate=,,timezone:America/Caracas
 
-LABEL America/Manaus
+LABEL timezone:America/Manaus
 	MENU LABEL (GMT-04:00) Manaus
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Manaus
+	APPEND isolinux.cfg calculate=,,timezone:America/Manaus
 
-LABEL America/Santiago
+LABEL timezone:America/Santiago
 	MENU LABEL (GMT-04:00) Santiago
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Santiago
+	APPEND isolinux.cfg calculate=,,timezone:America/Santiago
 
-LABEL America/St_Johns
+LABEL timezone:America/St_Johns
 	MENU LABEL (GMT-03:30) Newfoundland
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/St_Johns
+	APPEND isolinux.cfg calculate=,,timezone:America/St_Johns
 
-LABEL America/Sao_Paulo
+LABEL timezone:America/Sao_Paulo
 	MENU LABEL (GMT-03:00) Brasilia
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Sao_Paulo
+	APPEND isolinux.cfg calculate=,,timezone:America/Sao_Paulo
 
-LABEL America/Argentina/Buenos_Aires
+LABEL timezone:America/Argentina/Buenos_Aires
 	MENU LABEL (GMT-03:00) Buenos Aires,Georgetown
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Argentina/Buenos_Aires
+	APPEND isolinux.cfg calculate=,,timezone:America/Argentina/Buenos_Aires
 
-LABEL Etc/GMT+3
+LABEL timezone:Etc/GMT+3
 	MENU LABEL (GMT-03:00) Greenland
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Etc/GMT+3
+	APPEND isolinux.cfg calculate=,,timezone:Etc/GMT+3
 
-LABEL America/Montevideo
+LABEL timezone:America/Montevideo
 	MENU LABEL (GMT-03:00) Montevideo
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,America/Montevideo
+	APPEND isolinux.cfg calculate=,,timezone:America/Montevideo
 
-LABEL Atlantic/South_Georgia
+LABEL timezone:Atlantic/South_Georgia
 	MENU LABEL (GMT-02:00) Mid-Atlantic
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Atlantic/South_Georgia
+	APPEND isolinux.cfg calculate=,,timezone:Atlantic/South_Georgia
 
-LABEL Atlantic/Azores
+LABEL timezone:Atlantic/Azores
 	MENU LABEL (GMT-01:00) Azores
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Atlantic/Azores
+	APPEND isolinux.cfg calculate=,,timezone:Atlantic/Azores
 
-LABEL Atlantic/Cape_Verde
+LABEL timezone:Atlantic/Cape_Verde
 	MENU LABEL (GMT-01:00) Cape Verde Is.
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Atlantic/Cape_Verde
+	APPEND isolinux.cfg calculate=,,timezone:Atlantic/Cape_Verde
 
-LABEL UTC
+LABEL timezone:UTC
 	MENU LABEL (GMT+00:00) Greenwich Mean Time: Dublin,Edinburgh,Lisbon,London
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,UTC
+	APPEND isolinux.cfg calculate=,,timezone:UTC
 
-LABEL Africa/Casablanca
+LABEL timezone:Africa/Casablanca
 	MENU LABEL (GMT+00:00) Casablanca,Monrovia,Reykjavik
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Africa/Casablanca
+	APPEND isolinux.cfg calculate=,,timezone:Africa/Casablanca
 
-LABEL Europe/Amsterdam
+LABEL timezone:Europe/Amsterdam
 	MENU LABEL (GMT+01:00) Amsterdam,Berlin,Bern,Rome,Stockholm,Vienna
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Amsterdam
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Amsterdam
 
-LABEL Europe/Belgrade
+LABEL timezone:Europe/Belgrade
 	MENU LABEL (GMT+01:00) Belgrade,Bratislava,Budapest,Ljubljana,Prague
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Belgrade
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Belgrade
 
-LABEL Europe/Brussels
+LABEL timezone:Europe/Brussels
 	MENU LABEL (GMT+01:00) Brussels,Copenhagen,Madrid,Paris
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Brussels
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Brussels
 
-LABEL Europe/Zagreb
+LABEL timezone:Europe/Zagreb
 	MENU LABEL (GMT+01:00) Sarajevo,Skopje,Warsaw,Zagreb,Oslo
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Zagreb
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Zagreb
 
-LABEL Africa/Tunis
+LABEL timezone:Africa/Tunis
 	MENU LABEL (GMT+01:00) West Central Africa
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Africa/Tunis
+	APPEND isolinux.cfg calculate=,,timezone:Africa/Tunis
 
-LABEL Asia/Amman
+LABEL timezone:Asia/Amman
 	MENU LABEL (GMT+02:00) Amman
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Amman
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Amman
 
-LABEL Europe/Istanbul
+LABEL timezone:Europe/Istanbul
 	MENU LABEL (GMT+02:00) Athens,Bucharest,Istanbul
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Istanbul
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Istanbul
 
-LABEL Asia/Beirut
+LABEL timezone:Asia/Beirut
 	MENU LABEL (GMT+02:00) Beirut
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Beirut
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Beirut
 
-LABEL Europe/Kiev
+LABEL timezone:Europe/Kiev
 	MENU LABEL (GMT+02:00) Helsinki,Kyiv,Riga,Tallinn,Vilnius
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Kiev
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Kiev
 
-LABAL Europe/Sofia
+LABAL timezone:Europe/Sofia
 	MENU LABEL (GMT+02:00) Sofia
 	KENEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Sofia
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Sofia
 
-LABEL Africa/Windhoek
+LABEL timezone:Africa/Windhoek
 	MENU LABEL (GMT+02:00) Windhoek
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Africa/Windhoek
+	APPEND isolinux.cfg calculate=,,timezone:Africa/Windhoek
 
-LABEL Asia/Jerusalem
+LABEL timezone:Asia/Jerusalem
 	MENU LABEL (GMT+02:00) Jerusalem
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Jerusalem
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Jerusalem
 
-LABEL Africa/Cairo
+LABEL timezone:Africa/Cairo
 	MENU LABEL (GMT+02:00) Cairo
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Africa/Cairo
+	APPEND isolinux.cfg calculate=,,timezone:Africa/Cairo
 
-LABEL Europe/Minsk
+LABEL timezone:Europe/Minsk
 	MENU LABEL (GMT+02:00) Minsk
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Minsk
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Minsk
 
-LABEL Africa/Harare
+LABEL timezone:Africa/Harare
 	MENU LABEL (GMT+02:00) Harare,Pretoria
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Africa/Harare
+	APPEND isolinux.cfg calculate=,,timezone:Africa/Harare
 
-LABEL Asia/Baghdad
+LABEL timezone:Asia/Baghdad
 	MENU LABEL (GMT+03:00) Baghdad
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Baghdad
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Baghdad
 
-LABEL Asia/Kuwait
+LABEL timezone:Asia/Kuwait
 	MENU LABEL (GMT+03:00) Kuwait,Riyadh
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Kuwait
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Kuwait
 
-LABEL Europe/Moscow
+LABEL timezone:Europe/Moscow
 	MENU LABEL (GMT+03:00) Moscow,St. Petersburg,Volgograd
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Europe/Moscow
+	APPEND isolinux.cfg calculate=,,timezone:Europe/Moscow
 
-LABEL Africa/Nairobi
+LABEL timezone:Africa/Nairobi
 	MENU LABEL (GMT+03:00) Nairobi
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Africa/Nairobi
+	APPEND isolinux.cfg calculate=,,timezone:Africa/Nairobi
 
-LABEL Asia/Tbilisi
+LABEL timezone:Asia/Tbilisi
 	MENU LABEL (GMT+03:00) Tbilisi
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Tbilisi
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Tbilisi
 
-LABEL Asia/Tehran
+LABEL timezone:Asia/Tehran
 	MENU LABEL (GMT+03:30) Tehran
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Tehran
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Tehran
 
-LABEL Asia/Muscat
+LABEL timezone:Asia/Muscat
 	MENU LABEL (GMT+04:00) Abu Dhabi,Muscat
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Muscat
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Muscat
 
-LABEL Asia/Baku
+LABEL timezone:Asia/Baku
 	MENU LABEL (GMT+04:00) Baku
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Baku
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Baku
 
-LABEL Asia/Yerevan
+LABEL timezone:Asia/Yerevan
 	MENU LABEL (GMT+04:00) Yerevan
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Yerevan
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Yerevan
 
-LABEL Asia/Kabul
+LABEL timezone:Asia/Kabul
 	MENU LABEL (GMT+04:30) Kabul
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Kabul
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Kabul
 
-LABEL Asia/Yekaterinburg
+LABEL timezone:Asia/Yekaterinburg
 	MENU LABEL (GMT+05:00) Ekaterinburg
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Yekaterinburg
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Yekaterinburg
 
-LABEL Asia/Karachi
+LABEL timezone:Asia/Karachi
 	MENU LABEL (GMT+05:00) Islamabad,Karachi,Tashkent
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Karachi
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Karachi
 
-LABEL Asia/Calcutta
+LABEL timezone:Asia/Calcutta
 	MENU LABEL (GMT+05:30) Chennai,Kalkata,Bumbai,New Delhi
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Calcutta
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Calcutta
 
-LABEL Asia/Jayapura
+LABEL timezone:Asia/Jayapura
 	MENU LABEL (GMT+05:30) Sri Jayawardenepura
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Jayapura
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Jayapura
 
-LABEL Asia/Katmandu
+LABEL timezone:Asia/Katmandu
 	MENU LABEL (GMT+05:45) Kathmandu
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Katmandu
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Katmandu
 
-LABEL Asia/Almaty
+LABEL timezone:Asia/Almaty
 	MENU LABEL (GMT+05:00) Almaty
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Almaty
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Almaty
 
-LABEL Asia/Dhaka
+LABEL timezone:Asia/Dhaka
 	MENU LABEL (GMT+06:00) Astana,Dhaka
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Dhaka
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Dhaka
 
-LABEL Asia/Omsk
+LABEL timezone:Asia/Omsk
 	MENU LABEL (GMT+06:00) Omsk,Novosibirsk
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Omsk
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Omsk
 
-LABEL Asia/Rangoon
+LABEL timezone:Asia/Rangoon
 	MENU LABEL (GMT+06:30) Yangon (Rangoon)
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Rangoon
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Rangoon
 
-LABEL Asia/Bangkok
+LABEL timezone:Asia/Bangkok
 	MENU LABEL (GMT+07:00) Bangkok,Hanoi,Jakarta
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Bangkok
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Bangkok
 
-LABEL Asia/Krasnoyarsk
+LABEL timezone:Asia/Krasnoyarsk
 	MENU LABEL (GMT+07:00) Krasnoyarsk
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Krasnoyarsk
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Krasnoyarsk
 
-LABEL Asia/Hong_Kong
+LABEL timezone:Asia/Hong_Kong
 	MENU LABEL (GMT+08:00) Beijing,Chongqing,Hong Kong,Urumqi
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Hong_Kong
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Hong_Kong
 
-LABEL Asia/Irkutsk
+LABEL timezone:Asia/Irkutsk
 	MENU LABEL (GMT+08:00) Irkutsk,Ulaan Bataar
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Irkutsk
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Irkutsk
 
-LABEL Asia/Singapore
+LABEL timezone:Asia/Singapore
 	MENU LABEL (GMT+08:00) Kuala Lumpur,Singapore
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Singapore
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Singapore
 
-LABEL Australia/Perth
+LABEL timezone:Australia/Perth
 	MENU LABEL (GMT+08:00) Perth
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Australia/Perth
+	APPEND isolinux.cfg calculate=,,timezone:Australia/Perth
 
-LABEL Asia/Taipei
+LABEL timezone:Asia/Taipei
 	MENU LABEL (GMT+08:00) Taipei
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Taipei
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Taipei
 
-LABEL Asia/Tokyo
+LABEL timezone:Asia/Tokyo
 	MENU LABEL (GMT+09:00) Osaka,Sapporo,Tokyo
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Tokyo
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Tokyo
 
-LABEL Asia/Seoul
+LABEL timezone:Asia/Seoul
 	MENU LABEL (GMT+09:00) Seoul
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Seoul
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Seoul
 
-LABEL Asia/Yakutsk
+LABEL timezone:Asia/Yakutsk
 	MENU LABEL (GMT+09:00) Yakutsk
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Yakutsk
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Yakutsk
 
-LABEL Australia/Adelaide
+LABEL timezone:Australia/Adelaide
 	MENU LABEL (GMT+09:30) Adelaide
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Australia/Adelaide
+	APPEND isolinux.cfg calculate=,,timezone:Australia/Adelaide
 
-LABEL Australia/Darwin
+LABEL timezone:Australia/Darwin
 	MENU LABEL (GMT+09:30) Darwin
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Australia/Darwin
+	APPEND isolinux.cfg calculate=,,timezone:Australia/Darwin
 
-LABEL Australia/Brisbane
+LABEL timezone:Australia/Brisbane
 	MENU LABEL (GMT+10:00) Brisbane
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Australia/Brisbane
+	APPEND isolinux.cfg calculate=,,timezone:Australia/Brisbane
 
-LABEL Asia/Vladivostok
+LABEL timezone:Asia/Vladivostok
 	MENU LABEL (GMT+10:00) Vladivostok
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Vladivostok
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Vladivostok
 
-LABEL Pacific/Guam
+LABEL timezone:Pacific/Guam
 	MENU LABEL (GMT+10:00) Guam,Port Moresby
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Pacific/Guam
+	APPEND isolinux.cfg calculate=,,timezone:Pacific/Guam
 
-LABEL Australia/Melbourne
+LABEL timezone:Australia/Melbourne
 	MENU LABEL (GMT+10:00) Canberra,Melbourne,Sydney
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Australia/Melbourne
+	APPEND isolinux.cfg calculate=,,timezone:Australia/Melbourne
 
-LABEL Australia/Hobart
+LABEL timezone:Australia/Hobart
 	MENU LABEL (GMT+10:00) Hobart
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Australia/Hobart
+	APPEND isolinux.cfg calculate=,,timezone:Australia/Hobart
 
-LABEL Asia/Magadan
+LABEL timezone:Asia/Magadan
 	MENU LABEL (GMT+11:00) Magadan,Solomon Is.,New Caledonia
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Magadan
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Magadan
 
-LABEL Asia/Kamchatka
+LABEL timezone:Asia/Kamchatka
 	MENU LABEL (GMT+12:00) Fiji,Kamchatka,Marshall Is.
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Asia/Kamchatka
+	APPEND isolinux.cfg calculate=,,timezone:Asia/Kamchatka
 
-LABEL Pacific/Auckland
+LABEL timezone:Pacific/Auckland
 	MENU LABEL (GMT+12:00) Auckland,Wellington
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Pacific/Auckland
+	APPEND isolinux.cfg calculate=,,timezone:Pacific/Auckland
 
-LABEL Etc/GMT-13
+LABEL timezone:Etc/GMT-13
 	MENU LABEL (GMT+13:00) Nuku'alofa
 	KERNEL calcmenu.c32
-	APPEND isolinux.cfg calculate=,,Etc/GMT-13
+	APPEND isolinux.cfg calculate=,,timezone:Etc/GMT-13

builder/iso/calcboot/isolinux/vga.cfg

@@ -6,138 +6,138 @@ INCLUDE common.cfg
 
 MENUPARAM calculate 3
 
-LABEL auto
+LABEL resolution:auto
         MENU LABEL Auto
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,auto
+        APPEND isolinux.cfg calculate=,,,resolution:auto
 ENDTEXT
 
-LABEL 640x480
+LABEL resolution:640x480
         MENU LABEL 640x480
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,640x480
+        APPEND isolinux.cfg calculate=,,,resolution:640x480
 
-LABEL 800x480
+LABEL resolution:800x480
         MENU LABEL 800x480
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,800x480
+        APPEND isolinux.cfg calculate=,,,resolution:800x480
 
-LABEL 800x600
+LABEL resolution:800x600
         MENU LABEL 800x600
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,800x600
+        APPEND isolinux.cfg calculate=,,,resolution:800x600
 
-LABEL 1024x576
+LABEL resolution:1024x576
         MENU LABEL 1024x576
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1024x576
+        APPEND isolinux.cfg calculate=,,,resolution:1024x576
 
-LABEL 1024x600
+LABEL resolution:1024x600
         MENU LABEL 1024x600
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1024x600
+        APPEND isolinux.cfg calculate=,,,resolution:1024x600
 
-LABEL 1024x768
+LABEL resolution:1024x768
         MENU LABEL 1024x768
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1024x768
+        APPEND isolinux.cfg calculate=,,,resolution:1024x768
 
-LABEL 1200x800
+LABEL resolution:1200x800
         MENU LABEL 1200x800
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1200x800
+        APPEND isolinux.cfg calculate=,,,resolution:1200x800
 
-LABEL 1280x720
+LABEL resolution:1280x720
         MENU LABEL 1280x720
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1280x720
+        APPEND isolinux.cfg calculate=,,,resolution:1280x720
 
-LABEL 1280x768
+LABEL resolution:1280x768
         MENU LABEL 1280x768
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1280x768
+        APPEND isolinux.cfg calculate=,,,resolution:1280x768
 
-LABEL 1280x800
+LABEL resolution:1280x800
         MENU LABEL 1280x800
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1280x800
+        APPEND isolinux.cfg calculate=,,,resolution:1280x800
 
-LABEL 1280x1024
+LABEL resolution:1280x1024
         MENU LABEL 1280x1024
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1280x1024
+        APPEND isolinux.cfg calculate=,,,resolution:1280x1024
 
-LABEL 1360x768
+LABEL resolution:1360x768
         MENU LABEL 1360x768
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1360x768
+        APPEND isolinux.cfg calculate=,,,resolution:1360x768
 
-LABEL 1366x768
+LABEL resolution:1366x768
         MENU LABEL 1366x768
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1366x768
+        APPEND isolinux.cfg calculate=,,,resolution:1366x768
 
-LABEL 1368x768
+LABEL resolution:1368x768
         MENU LABEL 1368x768
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1368x768
+        APPEND isolinux.cfg calculate=,,,resolution:1368x768
 
-LABEL 1400x1050
+LABEL resolution:1400x1050
         MENU LABEL 1400x1050
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1400x1050
+        APPEND isolinux.cfg calculate=,,,resolution:1400x1050
 
-LABEL 1440x900
+LABEL resolution:1440x900
         MENU LABEL 1440x900
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1440x900
+        APPEND isolinux.cfg calculate=,,,resolution:1440x900
 
-LABEL 1600x768
+LABEL resolution:1600x768
         MENU LABEL 1600x768
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1600x768
+        APPEND isolinux.cfg calculate=,,,resolution:1600x768
 
-LABEL 1600x900
+LABEL resolution:1600x900
         MENU LABEL 1600x900
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1600x900
+        APPEND isolinux.cfg calculate=,,,resolution:1600x900
 
-LABEL 1600x1200
+LABEL resolution:1600x1200
         MENU LABEL 1600x1200
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1600x1200
+        APPEND isolinux.cfg calculate=,,,resolution:1600x1200
 
-LABEL 1680x945
+LABEL resolution:1680x945
         MENU LABEL 1680x945
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1680x945
+        APPEND isolinux.cfg calculate=,,,resolution:1680x945
 
-LABEL 1680x1050
+LABEL resolution:1680x1050
         MENU LABEL 1680x1050
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1680x1050
+        APPEND isolinux.cfg calculate=,,,resolution:1680x1050
 
-LABEL 1920x1080
+LABEL resolution:1920x1080
         MENU LABEL 1920x1080
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1920x1080
+        APPEND isolinux.cfg calculate=,,,resolution:1920x1080
 
-LABEL 1920x1200
+LABEL resolution:1920x1200
         MENU LABEL 1920x1200
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,1920x1200
+        APPEND isolinux.cfg calculate=,,,resolution:1920x1200
 
-LABEL 2048x1152
+LABEL resolution:2048x1152
         MENU LABEL 2048x1152
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,2048x1152
+        APPEND isolinux.cfg calculate=,,,resolution:2048x1152
 
-LABEL 2560x1440
+LABEL resolution:2560x1440
         MENU LABEL 2560x1440
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,2560x1440
+        APPEND isolinux.cfg calculate=,,,resolution:2560x1440
 
-LABEL 2560x1600
+LABEL resolution:2560x1600
         MENU LABEL 2560x1600
         KERNEL calcmenu.c32
-        APPEND isolinux.cfg calculate=,,,2560x1600
+        APPEND isolinux.cfg calculate=,,,resolution:2560x1600

builder/iso/calcboot/isolinux/video.cfg

@@ -6,68 +6,72 @@ INCLUDE common.cfg
 
 MENUPARAM calculate 4
 
-LABEL auto
+LABEL video:auto
         MENU LABEL Auto
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,auto,composite
+        APPEND vga.cfg calculate=,,,,video:auto,composite:on
 ENDTEXT
 
-LABEL intel
+LABEL video:intel
         MENU LABEL Intel (intel) with composite
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,i915,composite
+        APPEND vga.cfg calculate=,,,,video:i915,composite:on
 
-LABEL intel
+LABEL video:intelnocomp
         MENU LABEL Intel (intel)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,i915,nocomposite
+        APPEND vga.cfg calculate=,,,,video:i915,composite:off
 
-LABEL radeon
-        MENU LABEL ATI Radeon Open Source (radeon)
+LABEL video:radeon
+        MENU LABEL Ati Radeon Open Source (radeon) with composite
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,radeon,nocomposite
+        APPEND vga.cfg calculate=,,,,video:radeon,composite:on
 
-#?os_builder_linux_shortname!=CLS#
-LABEL fglrx
-        MENU LABEL Ati proprietary (fglrx)
+LABEL video:radeonnocomp
+        MENU LABEL Ati Radeon Open Source (radeon)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,fglrx,nocomposite
+        APPEND vga.cfg calculate=,,,,video:radeon,composite:off
 
-LABEL fglrx
+#?os_builder_linux_shortname!=CLS#
+LABEL video:fglrx
         MENU LABEL Ati proprietary (fglrx) with composite
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,fglrx,composite
+        APPEND vga.cfg calculate=,,,,video:fglrx,composite:on
+
+LABEL video:fglrxnocomp
+        MENU LABEL Ati proprietary (fglrx)
+        KERNEL calcmenu.c32
+        APPEND vga.cfg calculate=,,,,video:fglrx,composite:off
 
 #os_builder_linux_shortname#
-LABEL nv
+LABEL video:nv
         MENU LABEL Nvidia 2D only (nv)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nv,nocomposite
+        APPEND vga.cfg calculate=,,,,video:nv,composite:off
 
-LABEL nouveaucomp
+LABEL video:nouveau
         MENU LABEL Nvidia Open Source (nouveau) with composite
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nouveau,composite
+        APPEND vga.cfg calculate=,,,,video:nouveau,composite:on
 
-LABEL nouveau
+LABEL video:nouveaunocomp
         MENU LABEL Nvidia Open Source (nouveau)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nouveau,nocomposite
+        APPEND vga.cfg calculate=,,,,video:nouveau,composite:off
 
 #?os_builder_linux_shortname!=CLS#
-LABEL nvidiacomp
+LABEL video:nvidia
         MENU LABEL NVIDIA Proprietary (nvidia) with composite
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nvidia,composite
+        APPEND vga.cfg calculate=,,,,video:nvidia,composite:on
 
-LABEL nvidia
+LABEL video:nvidianocomp
         MENU LABEL NVIDIA Proprietary (nvidia)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,nvidia,nocomposite
+        APPEND vga.cfg calculate=,,,,video:nvidia,composite:off
 #os_builder_linux_shortname#
 
-LABEL vesa
+LABEL video:vesa
         MENU LABEL Generic VESA video driver (vesa)
         KERNEL calcmenu.c32
-        APPEND vga.cfg calculate=,,,,vesa,nocomposite
-
+        APPEND vga.cfg calculate=,,,,video:vesa,composite:off