diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/ChangeLog | 7 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 1 | ||||
| -rw-r--r-- | perl-install/fs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 14 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/drakboot | 7 |
7 files changed, 26 insertions, 13 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 70828981f..7a44db580 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -5,6 +5,13 @@ 2000-04-26 Pixel <pixel@mandrakesoft.com> + * install_steps_gtk.pm (choosePackagesTree): use a fix width for + the tree column (so that the checkbox are always visible without + scrolling) + + * standalone/drakboot: drakfloppy and gfloppy are X only, no need + to propose them in console + * install_any.pm (relGetFile): added auto_inst to files to get from Mandrake/base diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index cc8f68cea..e7349db66 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -713,6 +713,7 @@ Section "Module" # This loads the DBE extension module. Load "dbe" + Load "glx" # This loads the miscellaneous extensions module, and disables # initialisation of the XFree86-DGA extension within that module. diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 0d0129786..b4812c360 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -315,7 +315,7 @@ sub write($$$$) { my @to_add = ( $useSupermount ? [ split ' ', "/mnt/floppy /mnt/floppy supermount fs=vfat,dev=/dev/$floppy 0 0" ] : - [ split ' ', "/dev/$floppy /mnt/floppy auto sync,user,noauto,nosuid,nodev,unhide 0 0" ], + [ split ' ', "/dev/$floppy /mnt/floppy auto sync,user,noauto,nosuid,nodev 0 0" ], [ split ' ', 'none /proc proc defaults 0 0' ], [ split ' ', 'none /dev/pts devpts mode=0620 0 0' ], (map_index { diff --git a/perl-install/install2.pm b/perl-install/install2.pm index e8e833133..457a743fd 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -544,7 +544,7 @@ sub main { text => sub { $o->{interactive} = "newt" }, stdio => sub { $o->{interactive} = "stdio"}, corporate => sub { $::corporate = 1 }, - ks => sub { $::auto_install = $v }, + ks => sub { $::auto_install ||= 1 }, kickstart => sub { $::auto_install = $v }, auto_install => sub { $::auto_install = $v }, simple_themes => sub { $o->{simple_themes} = 1 }, diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 6e244322f..71ae77d70 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -384,13 +384,15 @@ Consoles 1,3,4,7 may also contain interesting information"; my $hasttf; my $dest = "$o->{prefix}/usr/X11R6/lib/X11/fonts/drakfont"; foreach (map { $_->{mntpoint} } grep { isFat($_) } @{$o->{fstab}}) { - my $d = "$_/windows/fonts"; - -d "$o->{prefix}$d" or next; - unless ($hasttf) { - mkdir $dest, 0755; - $hasttf = 1; + foreach my $d (grep { m|/win|i } glob_("$o->{prefix}$_/*")) { + $d .= "/fonts"; + -d "$o->{prefix}$d" or next; + unless ($hasttf) { + mkdir $dest, 0755; + $hasttf = 1; + } + /(.*)\.ttf/i and symlink "$d/$_", "$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$d"); } - /(.*)\.ttf/i and symlink "$d/$_", "$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$d"); } run_program::rooted($o->{prefix}, "ttmkfdir", "-d", $dest, "-o", "$dest/fonts.dir") if $hasttf; diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index f19d42560..a9d4984d9 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -350,14 +350,15 @@ sub choosePackagesTree { my $details = new Gtk::VBox(0,0); my $tree = Gtk::CTree->new(3, 0); $tree->set_selection_mode('browse'); - $tree->set_column_auto_resize($_, 1) foreach 0..2; + $tree->set_column_width(0, 200); + $tree->set_column_auto_resize($_, 1) foreach 1..2; gtkadd($w->{window}, gtkpack_(new Gtk::VBox(0,5), 0, _("Choose the packages you want to install"), 1, gtkpack(new Gtk::HBox(0,0), createScrolledWindow($tree), - gtkadd(gtkset_usize(new Gtk::Frame(_("Info")), 125, 0), + gtkadd(gtkset_usize(new Gtk::Frame(_("Info")), 150, 0), createScrolledWindow($info_widget = new Gtk::Text), )), 0, my $l = new Gtk::HBox(0,15), @@ -440,6 +441,7 @@ sub choosePackagesTree { my $imp = translate($pkgs::compssListDesc{pkgs::packageFlagBase($p) ? 100 : round_down($p->{values}[$ind], 10)}); gtktext_insert($info_widget, $@ ? _("Bad package") : + _("Name: %s\n", pkgs::packageName($p)) . _("Version: %s\n", pkgs::packageVersion($p) . '-' . pkgs::packageRelease($p)) . _("Size: %d KB\n", pkgs::packageSize($p) / 1024) . ($imp && _("Importance: %s\n", $imp)) . "\n" . diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 2bcef5da4..8bff3e2eb 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -26,9 +26,10 @@ my %l = ( ); -x $l{$_} or delete $l{$_} foreach grep { $l{$_} } keys %l; -my $cmd = $l{$in->ask_from_list(_("Choice"), _("What do you want to do?"), [ keys %l ])}; -exec $cmd if $cmd; - +if ($ENV{DISPLAY} && c::Xtest($ENV{DISPLAY})) { + my $cmd = $l{$in->ask_from_list(_("Choice"), _("What do you want to do?"), [ keys %l ])}; + exec $cmd if $cmd; +} my $bootloader = lilo::read('', '/etc/lilo.conf'); local ($_) = `detectloader`; |