summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2002-07-26 11:23:39 +0000
committerDaouda Lo <daouda@mandriva.com>2002-07-26 11:23:39 +0000
commit01eab8710027a9adfa643c0008c930ce2f8ccb5a (patch)
treed4ac7aa7633a357ad721e01a65dda14d37b01809
parent05708ba9ae464571009cbcc91ddc3a68ccecaa9a (diff)
downloaddrakx-01eab8710027a9adfa643c0008c930ce2f8ccb5a.tar
drakx-01eab8710027a9adfa643c0008c930ce2f8ccb5a.tar.gz
drakx-01eab8710027a9adfa643c0008c930ce2f8ccb5a.tar.bz2
drakx-01eab8710027a9adfa643c0008c930ce2f8ccb5a.tar.xz
drakx-01eab8710027a9adfa643c0008c930ce2f8ccb5a.zip
- more consistency when back button hit in wizard mode
- back button at last stage.
-rwxr-xr-xperl-install/standalone/logdrake11
1 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 38bc5c49a..78c35b541 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -412,6 +412,7 @@ my $initdir = "/etc/init.d";
step_service:
undef $::Wizard_no_previous;
+ undef $::Wizard_finished;
my $service ={
httpd => _("Apache World Wide Web Server"),
bind => _("Domain Name Resolver"),
@@ -422,6 +423,7 @@ my $initdir = "/etc/init.d";
webmin => _("Webmin Service"),
xinetd => _("Xinetd Service")
};
+ my @installed_d = ();
foreach $serv (keys %$service) {
-e "$initdir/$serv" && push (@installed_d,$serv);
}
@@ -435,10 +437,11 @@ my $initdir = "/etc/init.d";
for (keys %$service) {
# $cron .= $l->{$_}[2]."\n" if (${$_});
if(!-e "/var/lock/subsys/$_") { $r .="Service $_ ($service->{$_} is not running\n"};
- $cron .= "$r";
+ $cron .= "$r" if ${$_}; # take a look at this, don't know what is done here
}
step_load:
+ undef $::Wizard_finished;
$in->ask_from(_("load setting"),
_("You will receive an alert if the load is higher than this value"),
[
@@ -451,7 +454,7 @@ my ($load) = split ' ', first(cat_("/proc/loadavg"));
$r .= "Load is huge: $load\n" if ($load >@ . "$load);\n\n";
step_output:
- $::Wizard_no_previous = 1;
+# $::Wizard_no_previous = 1;
$::Wizard_finished = 1;
$in->ask_from(_("alert configuration"),
_("Configure the way the system will alert you"),
@@ -552,6 +555,10 @@ sub destroy_window {
# log
# $Log$
+# Revision 1.17 2002/07/26 11:23:39 daouda
+# - more consistency when back button hit in wizard mode
+# - back button at last stage.
+#
# Revision 1.16 2002/07/25 21:23:31 daouda
# - don't display services that are not installed
# - word wrap string correctly