summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog2
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/install_steps.pm4
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/keyboard.pm2
-rw-r--r--perl-install/my_gtk.pm1
-rw-r--r--perl-install/services.pm5
-rwxr-xr-xperl-install/standalone/drakxservices2
8 files changed, 12 insertions, 10 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 91862a820..82aa826d0 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,7 @@
2000-02-22 Pixel <pixel@mandrakesoft.com>
+ * MonitorsDB: replace the ` ' separator for vendor by `|'
+
* install_steps_interactive.pm (timeConfig): use ask_from_treelist
* interactive_gtk.pm (ask_from_treelist): creation of
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index d48df057d..6811ec4b4 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -224,7 +224,7 @@ sub monitorConfiguration(;$$) {
readMonitorsDB(-e "MonitorsDB" ? "MonitorsDB" : "/usr/X11R6/lib/X11/MonitorsDB");
- add2hash($monitor, { type => $in->ask_from_list(_("Monitor"), _("Choose a monitor"), ['Unlisted', keys %monitors], ' ' . translate($default_monitor)) }) unless $monitor->{type};
+ add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], ' ' . translate($default_monitor)) }) unless $monitor->{type};
if ($monitor->{type} eq 'Unlisted') {
$in->ask_from_entries_ref('',
_("The two critical parameters are the vertical refresh rate, which is the rate
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 78195440b..db66ebb92 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -659,8 +659,8 @@ sub setupBootloader($) {
sub setupXfreeBefore {
my ($o) = @_;
my $xkb = $o->{X}{keyboard}{xkb_keymap} || keyboard::keyboard2xkb($o->{keyboard});
- unless (-e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$xkb") {
- commands::cp("-f", keyboard::xmodmap_file($o->{keyboard}), "$o->{prefix}/etc/X11/xinit/Xmodmap");
+ if (!-e "$o->{prefix}/usr/X11R6/lib/X11/xkb/symbols/$xkb" && (my $f = keyboard::xmodmap_file($o->{keyboard}))) {
+ commands::cp("-f", $f, "$o->{prefix}/etc/X11/xinit/Xmodmap");
$xkb = '';
}
$o->{X}{keyboard}{xkb_keymap} = $xkb;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2de1d75ce..b664433d1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -24,7 +24,7 @@ use raid;
use mouse;
use modules;
use lang;
-use any;
+use services;
use keyboard;
use fs;
use log;
@@ -554,7 +554,7 @@ sub timeConfig {
#------------------------------------------------------------------------------
sub servicesConfig {
my ($o) = @_;
- any::drakxservices($o, $o->{prefix});
+ services::drakxservices($o, $o->{prefix});
}
#------------------------------------------------------------------------------
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index eb67ddb61..81f4fc9db 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -209,7 +209,7 @@ sub xmodmap_file {
run_program::run("extract_archive", "/usr/share/xmodmap.cz2", '/tmp', "xmodmap.$keyboard");
$f = "/tmp/xmodmap.$keyboard";
}
- $f;
+ -e $f && $f;
}
sub setup($) {
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index e09d700ab..97030b29d 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -325,6 +325,7 @@ sub _create_window($$) {
65481 => 'next',
65480 => 'previous' }}{$_[1]->{keyval}} or return;
if ($d eq "help") {
+ require install_steps_gtk;
install_steps_gtk::create_big_help();
} else {
my $s = $::o->{step};
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 6e838cc05..c75422c68 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -12,9 +12,8 @@ use run_program;
my %services = (
anacron => __("Anacron a periodic command scheduler."),
-apmd => __("apmd is used for monitoring batery status and logging it via
-syslog(8). It can also be used for shutting down the machine when the battery is
-low."),
+apmd => __("apmd is used for monitoring batery status and logging it via syslog.
+It can also be used for shutting down the machine when the battery is low."),
atd => __("Runs commands scheduled by the at command at the time specified when
at was run, and runs batch commands when the load average is low enough."),
crond => __("cron is a standard UNIX program that runs user-specified programs
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index 45270a7e7..6825ef6c9 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-use lib qw(.);#(/usr/lib/libDrakX);
+use lib qw(/usr/lib/libDrakX);
use common qw(:common :functional :file);
use interactive;