summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-06 14:42:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-06 14:42:37 +0000
commitd60215ea271cf171dd6292529a4c459e9148d883 (patch)
treea69cc8ab6149a70d583c354511ed749e0d83cecb /perl-install
parentcc85e855ad2d11bddbabc9e0a4d4e41df5ff6cc7 (diff)
downloaddrakx-backup-do-not-use-d60215ea271cf171dd6292529a4c459e9148d883.tar
drakx-backup-do-not-use-d60215ea271cf171dd6292529a4c459e9148d883.tar.gz
drakx-backup-do-not-use-d60215ea271cf171dd6292529a4c459e9148d883.tar.bz2
drakx-backup-do-not-use-d60215ea271cf171dd6292529a4c459e9148d883.tar.xz
drakx-backup-do-not-use-d60215ea271cf171dd6292529a4c459e9148d883.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/commands.pm3
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/help.pm2
-rw-r--r--perl-install/install2.pm4
-rw-r--r--perl-install/install_interactive.pm7
-rw-r--r--perl-install/install_steps_gtk.pm6
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/modules.pm9
8 files changed, 19 insertions, 17 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 5bc346694..247fa827a 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -510,7 +510,7 @@ sub kill {
sub lspci {
require detect_devices;
- print join "\n", detect_devices::stringlist(), '';
+ print join "\n", detect_devices::stringlist(@_), '';
}
*lssbus = *lspci;
@@ -578,6 +578,7 @@ sub bug {
header("scsi"), cat_("/proc/scsi/scsi"),
header("lsmod"), cat_("/proc/modules"),
header("cmdline"), cat_("/proc/cmdline"),
+ header("pcmcia: stab"), cat_("/var/run/stab"),
header("partitions"), cat_("/proc/partitions"),
header("cpuinfo"), cat_("/proc/cpuinfo"),
header("syslog"), cat_("/tmp/syslog"),
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 41a603a50..adc701a81 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -203,7 +203,7 @@ sub matching_desc {
grep { $_->{description} =~ /$regexp/i } probeall();
}
sub stringlist {
- map { " $_->{description} ($_->{type} $_->{driver})" } probeall(1);
+ map { " $_->{description} ($_->{type} $_->{driver})" } probeall(1, @_);
}
sub check {
my ($l) = @_;
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 9370fc9a0..273c7a30c 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -3,6 +3,8 @@ package help;
use common qw(:common);
%steps = (
+empty => '',
+
selectLanguage =>
__("Choose preferred language for install and system usage."),
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 84c86bdda..6a5b10103 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -50,8 +50,8 @@ my (%installSteps, @orderedInstallSteps);
formatPartitions => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ],
choosePackages => [ __("Choose packages to install"), 1, -2, '$::beginner', "formatPartitions" ],
installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ],
- configureNetwork => [ __("Configure networking"), 1, 1, '$::beginner && !$::corporate', "formatPartitions" ],
- installCrypto => [ __("Cryptographic"), 1, 1, '!$::expert', "configureNetwork" ],
+ configureNetwork => [ __("Configure networking"), 1, 1, '!$::corporate', "formatPartitions" ],
+#- installCrypto => [ __("Cryptographic"), 1, 1, '!$::expert', "configureNetwork" ],
configureTimezone => [ __("Configure timezone"), 1, 1, '', "installPackages" ],
configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages" ],
configurePrinter => [ __("Configure printer"), 1, 0, '', "installPackages" ],
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 26cfbd4f8..8b6bf9f92 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -22,6 +22,7 @@ sub partition_with_diskdrake {
my $ok = 1;
do {
diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions}, $nowizard);
+ log::l("diskdrake done");
delete $o->{wizard} and return partitionWizard($o, 'nodiskdrake');
my @fstab = fsedit::get_fstab(@$hds);
@@ -88,15 +89,15 @@ sub partitionWizardSolutions {
1;
} ];
$solutions{resize_fat} =
- [ 6 - @fats, _("Use the free space on the FAT partition"),
+ [ 6 - @fats, _("Use the free space on the Windows partition"),
sub {
my $part = $o->ask_from_listf('', _("Which partition do you want to resize?"), \&partition_table_raw::description, \@ok_forloopback) or return;
- my $w = $o->wait_message(_("Resizing"), _("Computing FAT filesystem bounds"));
+ my $w = $o->wait_message(_("Resizing"), _("Computing Windows filesystem bounds"));
my $resize_fat = eval { resize_fat::main->new($part->{device}, devices::make($part->{device})) };
$@ and die _("The FAT resizer is unable to handle your partition,
the following error occured: %s", $@);
my $min_win = $resize_fat->min_size;
- $part->{size} > $min_linux + $min_freewin + $min_win or die _("Your windows partition is too fragmented, please run ``defrag'' first");
+ $part->{size} > $min_linux + $min_freewin + $min_win or die _("Your Windows partition is too fragmented, please run ``defrag'' first");
$o->ask_okcancel('', _("WARNING!
DrakX will now resize your Windows partition. Be careful: this operation is
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 26ed409fb..d5727f273 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -609,6 +609,7 @@ sub create_big_help {
0, gtksignal_connect(new Gtk::Button(_("Ok")), "clicked" => sub { Gtk->main_quit }),
));
$w->main;
+ gtkset_mousecursor_normal();
}
#------------------------------------------------------------------------------
@@ -631,10 +632,9 @@ sub create_help_window {
my $pixmap = new Gtk::Pixmap( gtkcreate_xpm($w->{window}, "$ENV{SHARE_PATH}/help.xpm"));
gtkadd($w->{window},
gtkpack_(new Gtk::HBox(0,-2),
- 0, $pixmap,
- 1, createScrolledWindow($w_help = new Gtk::Text)
+ 0, gtkadd(gtksignal_connect(new Gtk::Button, clicked => \&create_big_help), $pixmap),
+ 1, createScrolledWindow($w_help = new Gtk::Text),
));
-
gtktext_insert($w_help, $o->{step} ? formatAlaTeX(_ deref($help::steps{$o->{step}})) : '');
$w->show;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 12da4cb5c..d5774fe6f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -200,7 +200,7 @@ sub ask_mntpoint_s {
} else {
install_any::suggest_mount_points($o->{hds}, $o->{prefix}, 'uniq');
- log::l("default mntpoint $_->{mntpoint}") foreach @fstab;
+ log::l("default mntpoint $_->{mntpoint} $_->{device}") foreach @fstab;
$o->ask_from_entries_refH('',
_("Choose the mount points"),
@@ -748,6 +748,7 @@ failures. Would you like to create a bootdisk for your system?"),
sub setupBootloaderBefore {
my ($o) = @_;
my $w = $o->wait_message('', _("Preparing bootloader"));
+ $o->set_help('empty');
$o->SUPER::setupBootloaderBefore($o);
}
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 2bcab65e6..51b51d4f7 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -572,7 +572,7 @@ sub pcmcia_need_config($) {
sub get_pcmcia_devices($$) {
my ($pcic) = @_;
- my (@devs, $module, $desc, $type, $device);
+ my (@devs, $desc);
#- try to setup pcmcia if cardmgr is not running.
if (pcmcia_need_config($pcic)) {
@@ -597,11 +597,8 @@ sub get_pcmcia_devices($$) {
foreach (cat_("/var/run/stab")) {
$desc = $1 if /^Socket\s+\d+:\s+(.*)/;
- ($type, $module, $device) = ($1, $2, $3) if /^\d+\s+(\S+)\s+(\S+)\s+\S+\s+(\S+)/;
- if ($desc && $module) {
- push @devs, { description => $desc, driver => $module, type => $type, device => $device };
- $desc = $module = undef;
- }
+ my (undef, $type, $module, undef, $device) = split;
+ push @devs, { description => $desc, driver => $module, type => $type, device => $device } if $module;
}
@devs;
}