summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drakwizard.spec15
-rw-r--r--po/fr.po4
-rw-r--r--time_wizard/scripts/NTPConf.pm1
3 files changed, 14 insertions, 6 deletions
diff --git a/drakwizard.spec b/drakwizard.spec
index cb0353a1..f602a777 100644
--- a/drakwizard.spec
+++ b/drakwizard.spec
@@ -1,6 +1,10 @@
-Name: drakwizard
-Version: 1.7
-Release: 2mdk
+%define name drakwizard
+%define version 1.8
+%define release 1mdk
+
+Name: %{name}
+Version: %{version}
+Release: %{release}
Source0: %{name}.tar.bz2
License: GPL
Group: System/Configuration/Other
@@ -47,10 +51,13 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
%_datadir/wizards*
%changelog
+* Tue Mar 11 2003 Warly <warly@mandrakesoft.com> 1.8-1mdk
+- ntp wizard add the server name in the ntp.conf file (bug 534)
+
* Tue Mar 11 2003 David BAUDENS <baudens@mandrakesoft.com> 1.7-2mdk
- Update banners
-* Sun Mar 09 2003 Warly <warly@mandrakesoft.com>
+* Sun Mar 09 2003 Warly <warly@mandrakesoft.com> 1.7-1mdk
- set server ip as dns if 127.0.0.1 is the server nameserver
* Sat Mar 08 2003 Warly <warly@mandrakesoft.com> 1.6-1mdk
diff --git a/po/fr.po b/po/fr.po
index 816538b7..421b6054 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -348,8 +348,8 @@ msgstr "Correction"
#: ../dhcp_wizard/dhcp.wiz_.c:3
msgid "Is the server authoritative ? Ask your system administrator."
msgstr ""
-"Le serveur est-il un serveur d'autorité ? Demandez à votre administrateur "
-"système."
+"Le serveur est-il un serveur d'autorité ?"
+"Demandez à votre administrateur système."
#: ../dhcp_wizard/dhcp.wiz_.c:4
msgid "Lowest IP Address:"
diff --git a/time_wizard/scripts/NTPConf.pm b/time_wizard/scripts/NTPConf.pm
index 77fbe867..efcc838d 100644
--- a/time_wizard/scripts/NTPConf.pm
+++ b/time_wizard/scripts/NTPConf.pm
@@ -55,6 +55,7 @@ sub do_it {
print NEW $ENV{server1}."\n";
print NEW $ENV{server2}."\n";
close NEW or die "can not close /etc/ntp/step-tickers: $!";
+ substInFile { s/(# server clock.via.net)/$1\nserver $ENV{server1}/ } '/etc/ntp.conf' if -f '/etc/ntp.conf';
standalone::explanations("Wrote /etc/ntp/step-tickers, starting services");
my @services = qw(crond atd ntpd);
foreach (@services) {