* Display the "Other Options" menu for the live CD too, but without the

d-i expert mode option.

debian/changelog

@@ -6,6 +6,8 @@ gfxboot-theme-ubuntu (0.5.2) UNRELEASED; urgency=low
     (LP: #46985, #56145).
   * Give checkbox semantics to the items in the F6 "Other Options" menu.
   * Add acpi=off, noapic, and nolapic options to the "Other Options" menu.
+  * Display the "Other Options" menu for the live CD too, but without the
+    d-i expert mode option.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Sun, 03 Feb 2008 18:09:54 +0000
 

dia_fulloptions.inc

@@ -12,7 +12,7 @@
 /.fulloptions.noapic 2 def
 /.fulloptions.nolapic 3 def
 
-% These strings are not translatable.
+% These strings are intentionally not translatable.
 /txt_acpi_off "acpi=off" def
 /txt_noapic "noapic" def
 /txt_nolapic "nolapic" def
@@ -27,9 +27,19 @@
   /xmenu.fulloptions .xm_size array def
   /xmenu xmenu.fulloptions def
 
-  xmenu .xm_current .fulloptions.expert put
+  is_live {
+    /.fulloptions.acpi_off dec
+    /.fulloptions.noapic dec
+    /.fulloptions.nolapic dec
+    xmenu .xm_current .fulloptions.acpi_off put
+  } {
+    xmenu .xm_current .fulloptions.expert put
+  } ifelse
 
-  xmenu .xm_list [ /txt_expert_mode /txt_acpi_off /txt_noapic /txt_nolapic ] put
+  xmenu .xm_list [
+    is_live not { /txt_expert_mode } if
+    /txt_acpi_off /txt_noapic /txt_nolapic
+  ] put
 
   xmenu .xm_title /txt_other_options put
   xmenu .xm_check 1 put
@@ -56,7 +66,7 @@
   0 1 xmenu .xm_allselected get length 1 sub {
     over over get {
       .undef
-      over .fulloptions.expert eq { pop "priority=low" } if
+      is_live not { over .fulloptions.expert eq { pop "priority=low" } if } if
       over .fulloptions.acpi_off eq { pop "acpi=off" } if
       over .fulloptions.noapic eq { pop "noapic" } if
       over .fulloptions.nolapic eq { pop "nolapic" } if

panel.inc

@@ -48,9 +48,7 @@
 
       [ .panel.short [ keyF6 0 "F6" /panel.options /panel.options.width /panel.options.update .undef ] ]
 
-      is_live not {
-	[ .panel.full [ keyF6 0 "F6" /panel.fulloptions /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ]
-      } if
+      [ .panel.full [ keyF6 0 "F6" /panel.fulloptions /panel.fulloptions.width /panel.fulloptions.update /fulloptions.init ] ]
 
       32+64bit_source {
 	64bit {