diff options
-rwxr-xr-x | control-center | 7 |
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 "; |