* Add live CD test function (looks for /casper/filesystem.cloop).

* Offer normal/expert mode panel option on media other than live CDs.
19 years ago · 96ee4e260d
parent 75ff8f8b77
commit 96ee4e260d
34 changed files with 415 additions and 47 deletions
--- a/boot.config
+++ b/boot.config
@ -1,7 +1,5 @@
 %% include system.inc

-/livecd false def
-
 %% include timeout.inc
 %% include common.inc

@ -19,6 +17,7 @@
 %% include dia_install.inc
 %% include dia_bits.inc
 %% include dia_options.inc
+%% include dia_dimode.inc
 %% include panel.inc
 %% include keytables.inc
 %% include locale.inc
--- a/common.inc
+++ b/common.inc
@ -45,6 +45,21 @@
 } def


+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+%
+% Are we a live image?
+%
+% ( ) ==> ( true|false )
+%
+/is_live {
+  % check only once
+  is_live.result .undef ne { is_live.result return } if
+
+  /is_live.result "/casper/filesystem.cloop" filesize .undef ne def
+
+  is_live.result return
+} def
+
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 %
 % Install source is 32 & 64bit?
@ -342,6 +357,12 @@

  } if

+  xmenu.dimode {
+    dimode.option .undef ne {
+      dimode.option "%s " bc.cmd dup length add sprintf
+    } if
+  } if
+
  bc.opts "%s " bc.cmd dup length add sprintf

  syslinux {
@ -405,23 +426,15 @@

 %  fadein_logo

-  enough_mem not livecd and {
+  32+64bit_source not {

-    notimeout nomem_popup
-
-  } {
-
-    32+64bit_source not {
-
-      64bit {
-        64bit_source not { notimeout 32bit_popup } if
-      } {
-        64bit_source { notimeout 64bit_popup } if
-      } ifelse
-
-    } if
+    64bit {
+      64bit_source not { notimeout 32bit_popup } if
+    } {
+      64bit_source { notimeout 64bit_popup } if
+    } ifelse

-  } ifelse
+  } if

 } def

--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
+gfxboot-theme-ubuntu (0.1.3) UNRELEASED; urgency=low
+
+  * Add live CD test function (looks for /casper/filesystem.cloop).
+  * Offer normal/expert mode panel option on media other than live CDs.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 19 Dec 2005 00:25:12 +0000
+
 gfxboot-theme-ubuntu (0.1.2) dapper; urgency=low

  * Don't add "64" to the end of certain kernel names when booting on amd64.
--- a/dia_dimode.inc
+++ b/dia_dimode.inc
@ -0,0 +1,88 @@
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+%
+% Panel d-i mode selector.
+%
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
+/dimode.option .undef def
+
+/.dimode.normal 0 def
+/.dimode.expert 1 def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Initialise d-i mode menu.
+%
+% ( ) ==> ( )
+%
+/dimode.init {
+  /xmenu.dimode .xm_size array def
+  /xmenu xmenu.dimode def
+
+  xmenu .xm_current .dimode.normal put
+
+  xmenu .xm_list [ txt_normal_mode txt_expert_mode ] put
+
+  pmenu.init
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Update d-i mode status.
+%
+% ( ) ==> ( )
+%
+/dimode.update {
+  /xmenu xmenu.dimode def
+
+  xmenu .xm_current get .dimode.normal eq {
+    /dimode.option .undef def
+  } {
+    /dimode.option "DEBCONF_PRIORITY=low" def
+  } ifelse
+
+  /window.action actRedrawPanel def
+
+  pmenu.update
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Show window.
+%
+% ( ) => ( )
+%
+/panel.dimode {
+  "dimode" help.setcontext
+
+  window.xmenu
+  dup .xmenu xmenu.dimode put
+  dup .xmenu.update /dimode.update put
+  dup window.init
+      window.show
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Return width of panel entry.
+%
+% ( ) => ( width )
+%
+/panel.dimode.width {
+  /xmenu xmenu.dimode def
+
+  pmenu.width
+} def
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+% Redraw panel entry.
+%
+% ( panel ) => ( )
+%
+/panel.dimode.update {
+  /xmenu xmenu.dimode def
+
+  pmenu.panel.update
+} def
--- a/help.inc
+++ b/help.inc
@ -65,7 +65,7 @@ clip.size pop 800 eq {
  dup "o_gateway" eq { pop "network" } if
  dup "o_pci" eq { pop "o_acpi" } if

-  syslinux not livecd or {
+  syslinux not {
    % only help, startup, keytable and option pages
    dup "o_" strstr 1 ne {
      dup "help" ne
--- a/install.config
+++ b/install.config
@ -1,7 +1,5 @@
 %% include system.inc

-/livecd false def
-
 %% include timeout.inc
 %% include common.inc

@ -19,6 +17,7 @@
 %% include dia_install.inc
 %% include dia_bits.inc
 %% include dia_options.inc
+%% include dia_dimode.inc
 %% include panel.inc
 %% include keytables.inc
 %% include locale.inc
--- a/panel.inc
+++ b/panel.inc
@ -17,8 +17,6 @@
 /panel.bg	lightgray def
 /panel.border	lightdotcolor def

-/panel.expert   false def
-
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 % Init panel.
 %
@ -39,31 +37,26 @@

    syslinux {

-      livecd {
-
-        [ keyF2 0 "F2" /panel.video /panel.video.width /panel.video.update /video.init ]
-        [ keyF3 0 "F3" /panel.options /panel.options.width /panel.options.update .undef ]
-
-      } {
-
-        [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ]
-        [ keyF3 0 "F3" /panel.options /panel.options.width /panel.options.update .undef ]
-        [ keyF4 0 "F4" /panel.video /panel.video.width /panel.video.update /video.init ]
-
-        32+64bit_source {
-          64bit {
-            32bit_boot_dir .undef ne
-            64bit_boot_dir .undef ne
-            32bit_boot_dir 64bit_boot_dir ne
-            and and {
-              [ keyF6 0 "F6" /panel.bits /panel.bits.width /panel.bits.update /bits.init ]
-            } if
-          } if
-        } if
-
-        xmenu.bits .undef eq { bits.init } if
-
-      } ifelse
+      [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ]
+      [ keyF3 0 "F3" /panel.options /panel.options.width /panel.options.update .undef ]
+      [ keyF4 0 "F4" /panel.video /panel.video.width /panel.video.update /video.init ]
+
+      is_live not {
+	[ keyF5 0 "F5" /panel.dimode /panel.dimode.width /panel.dimode.update /dimode.init ]
+      } if
+
+      32+64bit_source {
+	64bit {
+	  32bit_boot_dir .undef ne
+	  64bit_boot_dir .undef ne
+	  32bit_boot_dir 64bit_boot_dir ne
+	  and and {
+	    [ keyF6 0 "F6" /panel.bits /panel.bits.width /panel.bits.update /bits.init ]
+	  } if
+	} if
+      } if
+
+      xmenu.bits .undef eq { bits.init } if

    } {

--- a/po/bg.po
+++ b/po/bg.po
@ -230,3 +230,13 @@ msgstr "Други параметри"
 #. txt_language
 msgid "Language"
 msgstr "Език"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/bootloader.pot
+++ b/po/bootloader.pot
@ -196,3 +196,12 @@ msgstr ""
 msgid "Language"
 msgstr ""

+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/cs.po
+++ b/po/cs.po
@ -230,3 +230,13 @@ msgstr "Další volby"
 #. txt_language
 msgid "Language"
 msgstr "Jazyk"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/da.po
+++ b/po/da.po
@ -227,3 +227,13 @@ msgstr "Andre indstillinger"
 #. txt_language
 msgid "Language"
 msgstr "Sprog"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/de.po
+++ b/po/de.po
@ -227,3 +227,13 @@ msgstr "Weitere Optionen"
 #. txt_language
 msgid "Language"
 msgstr "Sprache"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/el.po
+++ b/po/el.po
@ -228,3 +228,13 @@ msgstr "Άλλες Επιλογές"
 #. txt_language
 msgid "Language"
 msgstr "Γλώσσα"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/es.po
+++ b/po/es.po
@ -228,3 +228,13 @@ msgstr "Otras opciones"
 #. txt_language
 msgid "Language"
 msgstr "Idioma"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/fi.po
+++ b/po/fi.po
@ -227,3 +227,13 @@ msgstr "Muut valinnat"
 #. txt_language
 msgid "Language"
 msgstr "Kieli"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/fr.po
+++ b/po/fr.po
@ -232,3 +232,13 @@ msgstr "Autres options"
 #. txt_language
 msgid "Language"
 msgstr "Langue"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/hu.po
+++ b/po/hu.po
@ -230,3 +230,13 @@ msgstr "Egyéb beállítások"
 #. txt_language
 msgid "Language"
 msgstr "Nyelv"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/it.po
+++ b/po/it.po
@ -227,3 +227,13 @@ msgstr "Altre opzioni"
 #. txt_language
 msgid "Language"
 msgstr "Lingua"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/ja.po
+++ b/po/ja.po
@ -222,3 +222,13 @@ msgstr "その他のオプション"
 #. txt_language
 msgid "Language"
 msgstr "言語"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/lt.po
+++ b/po/lt.po
@ -224,3 +224,13 @@ msgstr "Kiti parametrai"
 #. txt_language
 msgid "Language"
 msgstr "Kalba"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/nb.po
+++ b/po/nb.po
@ -229,3 +229,13 @@ msgstr "Andre valg"
 #. txt_language
 msgid "Language"
 msgstr "Språk"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/nl.po
+++ b/po/nl.po
@ -230,3 +230,13 @@ msgstr "Andere opties"
 #. txt_language
 msgid "Language"
 msgstr "Taal"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/pl.po
+++ b/po/pl.po
@ -223,3 +223,13 @@ msgstr "Inne opcje"
 #. txt_language
 msgid "Language"
 msgstr "Język"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/pt.po
+++ b/po/pt.po
@ -227,3 +227,13 @@ msgstr "Outras Opções"
 #. txt_language
 msgid "Language"
 msgstr "Idioma"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@ -223,3 +223,13 @@ msgstr "Outras Opções"
 #. txt_language
 msgid "Language"
 msgstr "Idioma"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/ro.po
+++ b/po/ro.po
@ -230,3 +230,13 @@ msgstr ""
 #. txt_language
 msgid "Language"
 msgstr ""
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/ru.po
+++ b/po/ru.po
@ -232,3 +232,13 @@ msgstr ""
 #. txt_language
 msgid "Language"
 msgstr ""
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/sk.po
+++ b/po/sk.po
@ -234,3 +234,13 @@ msgstr ""
 #. txt_language
 msgid "Language"
 msgstr ""
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/sl.po
+++ b/po/sl.po
@ -231,3 +231,13 @@ msgstr "Ostale možnosti"
 #. txt_language
 msgid "Language"
 msgstr "Jezik"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/sr.po
+++ b/po/sr.po
@ -224,3 +224,13 @@ msgstr "Остале опције"
 #. txt_language
 msgid "Language"
 msgstr "Језик"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/sv.po
+++ b/po/sv.po
@ -227,3 +227,13 @@ msgstr "Fler alternativ"
 #. txt_language
 msgid "Language"
 msgstr "Språk"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/uk.po
+++ b/po/uk.po
@ -232,3 +232,13 @@ msgstr ""
 #. txt_language
 msgid "Language"
 msgstr ""
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@ -223,3 +223,13 @@ msgstr "其他选项"
 #. txt_language
 msgid "Language"
 msgstr "语言"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@ -223,3 +223,13 @@ msgstr "其他選項"
 #. txt_language
 msgid "Language"
 msgstr "語言"
+
+# label for d-i mode menu
+#. txt_normal_mode
+msgid "Normal mode"
+msgstr ""
+
+# label for d-i mode menu
+#. txt_expert_mode
+msgid "Expert mode"
+msgstr ""