fix apache

fix dns_client adding a \n at the end of the line of the configuration file
fix squid
fix inn
fix ftp
fix samba
add a init function in drakwizard.pl for case such as apache which need to initialize some parameters
separate region/country in ntp wizard

1 files changed, 5 insertions, 1 deletions

diff --git a/drakwizard.pl b/drakwizard.pl
index c17525e0..05c2e9c4 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -79,6 +79,7 @@ sub wizard {
     my $next = 'welcome';
     my @steps;
     check_rpm($o->{needed_rpm}) if $o->{needed_rpm};
+    defined $o->{init} and &{$o->{init}};
     while (1) {
 	undef $::Wizard_no_previous; 
         undef $::Wizard_no_cancel;
@@ -91,7 +92,9 @@ sub wizard {
 	my $data2;
 	foreach my $d (@$data) {
 	    $d->{fixed_val} and $d->{val} = ${$d->{fixed_val}};
-	    $d->{fixed_list} and $d->{list} = ${$d->{fixed_list}};
+	    if ($d->{fixed_list}) {
+		$d->{list} = $d->{fixed_list}; 
+	    }
 	    if (ref $d->{boolean_list} && ref ${$d->{boolean_list}}) { 
 		my $i;
 		foreach (@{${$d->{boolean_list}}}){ 
@@ -121,6 +124,7 @@ sub check_rpm {
 	if (!$in->do_pkgs->is_installed($rpm)) {
 	    if ($in->ask_okcancel("error", N("%s is not installed\nClick \"Next\" to install or \"Cancel\" to quit", c::from_utf8($rpm)))) {
 		$::testing and next;
+		print "\nINSTALLING $rpm\n";
 		if (!$in->do_pkgs->install($rpm)) {
 		    $::Wizard_finished = 1;
 		    $in->ask_okcancel("error", N("installation failed"));