diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2009-03-09 17:48:36 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2009-03-09 17:48:36 +0000 |
| commit | 1a6ed9531f6442bdd82890a12a90118e4acf1e8d (patch) | |
| tree | 171d77d60ff94304a335a614659ad891c2c45dee /src | |
| parent | 8fc16d33dbae87db5027521a8490f10e3054896e (diff) | |
| download | bootloader-theme-1a6ed9531f6442bdd82890a12a90118e4acf1e8d.tar bootloader-theme-1a6ed9531f6442bdd82890a12a90118e4acf1e8d.tar.gz bootloader-theme-1a6ed9531f6442bdd82890a12a90118e4acf1e8d.tar.bz2 bootloader-theme-1a6ed9531f6442bdd82890a12a90118e4acf1e8d.tar.xz bootloader-theme-1a6ed9531f6442bdd82890a12a90118e4acf1e8d.zip | |
Use "suffix" value defined in dia_bits.inc in boot entry building
dia_bits.inc defines bits.suffix which tells us which suffix to prepend
to entry names depending on the value of the "bits" menu and of the
current CD and the current CPU. Fix definition of this value so that
it's always correct, and use it when building entry names.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common.inc | 6 | ||||
| -rw-r--r-- | src/dia_bits.inc | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/common.inc b/src/common.inc index 731c23e..cc7f282 100644 --- a/src/common.inc +++ b/src/common.inc @@ -304,10 +304,10 @@ bc.cmd 0 0 put } { menu.texts menu.entry get - xmenu.bits .xm_current get 1 eq { - "64" exch "%s%s " + bits.suffix xmenu.bits .xm_current get get dup { + exch "%s%s " } { - "%s " + pop "%s " } ifelse bc.cmd sprintf } ifelse diff --git a/src/dia_bits.inc b/src/dia_bits.inc index 76c2689..2a4efc1 100644 --- a/src/dia_bits.inc +++ b/src/dia_bits.inc @@ -33,12 +33,9 @@ /bits.default 1 def xmenu .xm_list [ "x86" "x86-64" ] put } if - } if - - % no '64' suffix - 32bit_boot_dir 64bit_boot_dir ne { + } { bits.suffix 1 .undef put - } if + } ifelse xmenu .xm_current bits.default put |