summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2002-08-19 13:31:13 +0000
committerDaouda Lo <daouda@mandriva.com>2002-08-19 13:31:13 +0000
commit0fcc065f3c15a61d2e9cd2ce9b940fbbb27dc4d5 (patch)
tree8e5bfc4709911cfce381a691385c4e2cae3a721c
parent253471748b1f6cb674bf69c246b8cb6d306cadc0 (diff)
downloadcontrol-center-0fcc065f3c15a61d2e9cd2ce9b940fbbb27dc4d5.tar
control-center-0fcc065f3c15a61d2e9cd2ce9b940fbbb27dc4d5.tar.gz
control-center-0fcc065f3c15a61d2e9cd2ce9b940fbbb27dc4d5.tar.bz2
control-center-0fcc065f3c15a61d2e9cd2ce9b940fbbb27dc4d5.tar.xz
control-center-0fcc065f3c15a61d2e9cd2ce9b940fbbb27dc4d5.zip
- according to expert / recommanded mode : set the logs or not by
default expert = no logs recommanded = logs
-rwxr-xr-xcontrol-center7
1 files changed, 4 insertions, 3 deletions
diff --git a/control-center b/control-center
index ea7c53c6..473c534c 100755
--- a/control-center
+++ b/control-center
@@ -42,11 +42,12 @@ use POSIX qw(uname);
my $in = 'interactive'->vnew('su', 'default');
-my ($_version, $conffile) = ("9.0", "/etc/mcc.conf");
+my ($_version, $conffile, $class_install) = ("9.0", "/etc/mcc.conf","/etc/sysconfig/system");
my %h = getVarsFromSh($conffile);
+my %class = getVarsFromSh($class_install);
defined $h{THEME} or $h{THEME} = 'default';
defined $h{EMBEDDED} or $h{EMBEDDED} = bool2text(1);
-defined $h{LOGS} or $h{LOGS} = bool2text(0);
+defined $h{LOGS} or do { if ($class{CLASS} eq 'expert') {$h{LOGS} = bool2text(0)} else {$h{LOGS} = bool2text(1)}};
my ($embedded, $logs) = (text2bool($h{EMBEDDED}), text2bool($h{LOGS}));
my $theme = $h{THEME};
if ("@ARGV" =~ /--theme (\w+)/) { $theme = $1 }
@@ -591,7 +592,7 @@ sub compute_exec_string {
if ($logs) {
my $pid;
$exp_socket->realize;
- $exec_log = "logdrake --explain=$log_exp --embedded " . $exp_socket->window->XWINDOW . " " . $$;
+ $exec_log = "logdrake --explain=$dra --embedded " . $exp_socket->window->XWINDOW . " " . $$;
unless ($pid = fork) {
splash_warning(_("cannot fork: %s", $~)) unless defined $pid;
print "explain : $log_exp \n ";