summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/Xconfigurator_consts.pm3
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install_steps_gtk.pm4
-rw-r--r--perl-install/keyboard.pm2
-rw-r--r--perl-install/lang.pm14
-rw-r--r--perl-install/share/fonts.tar.bz2bin1096538 -> 1110104 bytes
-rwxr-xr-xperl-install/standalone/drakboot5
8 files changed, 18 insertions, 14 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index fbfdc0dfd..3e3efd6d8 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -24,7 +24,7 @@ $(DIRS):
$(MAKE) -C $@
test_pms: verify_c
- ./perl2fcalls -excludec -excluderesize_fat::c_rewritten install2 standalone/keyboarddrake standalone/XFdrake
+ ./perl2fcalls -excludec -excluderesize_fat::c_rewritten install2 standalone/keyboarddrake standalone/XFdrake standalone/drakboot
for i in install2 install_steps_*.pm; do perl -cw -I. $$i; done
verify_c:
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 914059b4c..a9352cb86 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -1,4 +1,5 @@
-use common qw(:common);
+package Xconfigurator;
+
%depths = (
8 => __("256 colors (8 bits)"),
diff --git a/perl-install/any.pm b/perl-install/any.pm
index eb6eee009..132e72831 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -433,7 +433,7 @@ sub setup_thiskind {
}
@l = map { $_->{description} } @l;
while (1) {
- my ($msg_type) = $type =~ s/\|.*//;
+ (my $msg_type = $type) =~ s/\|.*//;
my $msg = @l ?
[ _("Found %s %s interfaces", join(", ", @l), $msg_type),
_("Do you have another one?") ] :
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 6e70ff99d..0eacebedb 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -575,7 +575,7 @@ sub install_theme {
load_rc($_) foreach "themes-$o->{theme}", "install", "themes";
- if (my ($font, $font2) = lang::get_x_fontset($o->{lang})) {
+ if (my ($font, $font2) = lang::get_x_fontset($o->{lang}, $::rootwidth < 800 ? 10 : 12)) {
$font2 ||= $font;
Gtk::Rc->parse_string(qq(
style "default-font"
@@ -590,7 +590,7 @@ widget "*" style "default-font"
widget "*Steps*" style "small-font"
));
- }
+ }
gtkset_background(@background1);# unless $::testing;
create_logo_window($o);
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 7cce0d1ff..70aa0df5f 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -268,7 +268,7 @@ sub setup {
local *F;
open F, "packdrake -x $ENV{SHARE_PATH}/keymaps.cz2 '' $o->[1].bkmap |";
local $/ = undef;
- eval { load(scalar <F>) };
+ eval { load(join('', <F>)) };
}
my $f = xmodmap_file($keyboard);
eval { run_program::run('xmodmap', $f) } unless $::testing || !$f;
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index e81b711b7..cec746739 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -152,7 +152,7 @@ my %xim = (
sub std2 { "-*-*-medium-r-normal-*-$_[1]-*-*-*-*-*-$_[0]" }
sub std_ { std2($_[0], 10), std2($_[0], 10) }
-sub std { std2($_[0], 12), std2($_[0], 8) }
+sub std { std2($_[0], $_[1] || 10), std2($_[0], 8) }
#- [0]: console font name; [1]: unicode map for console font
#- [2]: acm file for console font; [3]: X11 fontset
@@ -169,9 +169,9 @@ my %charsets = (
"georgian-ps" => [ "t_geors", "geors.uni", "geors_to_geops.trans",
"-*-*-*-*-*-*-*-*-*-*-*-*-georgian-academy" ],
"iso-8859-1" => [ "lat0-sun16", undef, "iso15",
- std("iso8859-1") ],
+ sub { std("iso8859-1", @_) } ],
"iso-8859-2" => [ "lat2-sun16", undef, "iso02",
- std("iso8859-2") ],
+ sub { std("iso8859-2", @_) } ],
"iso-8859-3" => [ "iso03.f16", undef, "iso03",
std_("iso8859-3") ],
"iso-8859-4" => [ "lat4u-16", undef, "iso04",
@@ -189,7 +189,7 @@ my %charsets = (
"iso-8859-8" => [ "iso08.f16", "iso08", "trivial.trans",
std_("iso8859-8") ],
"iso-8859-9" => [ "iso09.f16", "iso09", "trivial.trans",
- std("iso8859-9") ],
+ sub { std("iso8859-9", @_) } ],
"iso-8859-13" => [ "tlat7", "iso01", "trivial.trans",
std_("iso8859-13") ],
"iso-8859-14" => [ "tlat8", "iso01", "trivial.trans",
@@ -420,11 +420,13 @@ sub load_console_font {
#-}
sub get_x_fontset {
- my ($lang) = @_;
+ my ($lang, $size) = @_;
my $l = $languages{$lang} or return;
my $c = $charsets{$l->[1]} or return;
- @$c[3..4];
+ my ($big, $small) = @$c[3..4];
+ ($big, $small) = $big->($size) if ref $big;
+ ($big, $small);
}
#-######################################################################################
diff --git a/perl-install/share/fonts.tar.bz2 b/perl-install/share/fonts.tar.bz2
index 90d5abe74..97a1f71c2 100644
--- a/perl-install/share/fonts.tar.bz2
+++ b/perl-install/share/fonts.tar.bz2
Binary files differ
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index ffff1a05c..b5656dc4a 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -2,12 +2,13 @@
use lib qw(/usr/lib/libDrakX);
-use common qw(:common :system :file :functional);
+use common qw(:common :file :functional);
use interactive;
use any;
use bootloader;
use detect_devices;
use fsedit;
+use fs;
use c;
local $_ = join '', @ARGV;
@@ -17,7 +18,7 @@ local $_ = join '', @ARGV;
$::expert = /-expert/;
$::isStandalone = 1;
-my $in = vnew interactive('su');
+my $in = interactive->vnew('su');
my %l = (
arch() !~ /sparc|alpha/ ? (