diff options
| author | Florent Villard <warly@mandriva.com> | 2003-03-11 14:15:54 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2003-03-11 14:15:54 +0000 |
| commit | 4094941cf2866e5778d1fdff38a05d6dd1acfc2b (patch) | |
| tree | ec14d1e1844a52af1def5cadfef601ecf988dc15 | |
| parent | 98e2a162a8f786f157f774ac7aae07c1aafadc0e (diff) | |
| download | drakwizard-4094941cf2866e5778d1fdff38a05d6dd1acfc2b.tar drakwizard-4094941cf2866e5778d1fdff38a05d6dd1acfc2b.tar.gz drakwizard-4094941cf2866e5778d1fdff38a05d6dd1acfc2b.tar.bz2 drakwizard-4094941cf2866e5778d1fdff38a05d6dd1acfc2b.tar.xz drakwizard-4094941cf2866e5778d1fdff38a05d6dd1acfc2b.zip | |
add server in ntp.conf in time wizard
| -rw-r--r-- | drakwizard.spec | 15 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | time_wizard/scripts/NTPConf.pm | 1 |
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 @@ -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) { |