summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2005-09-08 19:53:43 +0000
committerAntoine Ginies <aginies@mandriva.com>2005-09-08 19:53:43 +0000
commit4fbabba847cf92058d9b59519241b8378b89eebe (patch)
treeddcdd4be95bfbcbf9e5b1b56c21c7bba815cab64
parentb36245451af137c3d239b91624185f5faa5c7a47 (diff)
downloaddrakwizard-4fbabba847cf92058d9b59519241b8378b89eebe.tar
drakwizard-4fbabba847cf92058d9b59519241b8378b89eebe.tar.gz
drakwizard-4fbabba847cf92058d9b59519241b8378b89eebe.tar.bz2
drakwizard-4fbabba847cf92058d9b59519241b8378b89eebe.tar.xz
drakwizard-4fbabba847cf92058d9b59519241b8378b89eebe.zip
answer yes to erase old conf
-rwxr-xr-xkolab_wizard/Kolab.pm13
1 files 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;