From 4fbabba847cf92058d9b59519241b8378b89eebe Mon Sep 17 00:00:00 2001
From: Antoine Ginies <aginies@mandriva.com>
Date: Thu, 8 Sep 2005 19:53:43 +0000
Subject: answer yes to erase old conf

---
 kolab_wizard/Kolab.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm
index 512d14c0..75bbcdae 100755
--- a/kolab_wizard/Kolab.pm
+++ b/kolab_wizard/Kolab.pm
@@ -238,8 +238,9 @@ sub do_it_master_withoutca {
 
 sub do_it_master {
   return if $::testing;
-  !-f "/etc/kolab/.kolab2_configured" and system("touch /etc/kolab/.kolab2_configured");
-  MDK::Wizard::Wizcommon_gtk2::gtk_log("service kolab stop", "");
+  my $oldconf;
+  !-f "/etc/kolab/.kolab2_configured" and $oldconf = "y";
+  MDK::Wizard::Wizcommon_gtk2::gtk_log("service kolab stop", "Kolab stop...");
   my $in = 'interactive'->vnew('su', 'Kolab server');
   my $w = $in->wait_message(N("Kolab server"), N("Configuring Kolab server on your system..."));
 
@@ -254,9 +255,13 @@ sub do_it_master {
 
   $ENV{PASSKOLAB} = $o->{var}{password};
 
+  # create tempory file:
+  system("echo $o->{var}{capasswd} > /etc/kolab/data");
+  system("echo $o->{var}{keycapasswd} > /etc/kolab/data2");
+
   my $F;
   open($F, "|/usr/sbin/kolab_bootstrap -b\n");
-  print $F "y
+  print $F "$oldconf
 $o->{var}{hostname}
 $o->{var}{masterslave}
 $o->{var}{domain}
@@ -270,7 +275,7 @@ y
 ";
   close $F;
   undef $w;
-  MDK::Wizard::Wizcommon_gtk2::gtk_log("service kolab start", "");
+  MDK::Wizard::Wizcommon_gtk2::gtk_log("service kolab start", "Kolab start...");
 }
 
 1;
-- 
cgit v1.2.1