Commit 226a84fc authored by Eric S. Raymond's avatar Eric S. Raymond

Finiush namespace cleanup: ntpkeygen and ntpwait.

parent 8623dbee
......@@ -58,7 +58,7 @@ ntpdate/:: Directory containing sources for a program to set the
local machine time from one or more remote machines
running NTP. Operates like rdate, but much more accurate.
ntp-keygen::
ntpkeygen::
Directory containing the utility program used to generate
NTP authentication keys.
......
......@@ -19,20 +19,20 @@ ntp=ntp
ntpd=ntpd
ntpdig=ntpdig
ntpdconf=ntpd.conf
ntpkeygen=ntp-keygen
ntpkeygen=ntpkeygen
ntpkeys=ntp.keys
ntpq=ntpq
ntptickadj=ntptickadj
ntptime=ntptime
ntpwait=ntp-wait
ntpwait=ntpwait
# Annoyingly, these have to be *manually* synchronized with the headers
# on their manual pages - asciidoc doesn't expand attributes in header lines.
ntpdconfman=ntp.conf(5)
ntpkeygenman=ntp-keygen(8)
ntpkeygenman=ntpkeygen(8)
ntpkeysman=ntp.keys(5)
ntpdman=ntpd(8)
ntpqman=ntpq(1)
ntptickadjman=tntptickadj(8)
ntptickadjman=ntptickadj(8)
ntptimeman=ntptime(8)
ntpwaitman=ntp-wait(8)
ntpwaitman=ntpwait(8)
ntpdigman=ntpdig(1)
// This is the body of the manual page for ntp-keygen.
// This is the body of the manual page for ntpkeygen.
// It's included in two places: once for the docs/ HTML
// tree, and once to make an individual man page.
......@@ -349,7 +349,7 @@ or dynamic means described on the _Automatic_ _NTP_ _Configuration_
_Options_ section of {ntpconfman}.
On each trusted host as root, change to the keys directory. To insure a
fresh fileset, remove all _ntpkey_ files. Then run `ntp-keygen` `-T` to
fresh fileset, remove all _ntpkey_ files. Then run `{ntpkeygen}` `-T` to
generate keys and a trusted certificate. On all other hosts do the same,
but leave off the `-T` flag to generate keys and nontrusted
certificates. When complete, start the NTP daemons beginning at the
......
......@@ -33,7 +33,7 @@ returns "the time is not yet stable".
`-v`, `--verbose`::
Be verbose.
+
By default, `{ntpwait}` is silent. With this option, `ntp-wait` will
By default, `{ntpwait}` is silent. With this option, `{ntpwait}` will
provide status information.
== AUTHOR ==
......
......@@ -88,7 +88,8 @@ few will be user-visible:
* The sntp program has been renamed {ntpdig} in order to make
NTP installables have a uniform name prefix and take up less
namespace.
namespace. Also, `ntp-keygen` is now {ntpkeygen} and `ntp-wait`
is {ntpwait}.
* The deprecated ntpdate program has been replaced with a shell
wrapper around {ntpdig}.
......
= `{ntpwait}` - wait until {ntpd} is in synchronized state =
include::includes/ntp-wait-body.txt[]
include::includes/ntpwait-body.txt[]
'''''
......
= ntp-keygen(8) =
= ntpkeygen(8) =
:doctype: manpage
== NAME ==
......
......@@ -193,7 +193,7 @@ readlink(
* Vista and later only. Instead, if CreateHardLink is available (XP
* and later), hardlink the linkname to the original filename. On
* earlier systems, user must rename file to match expected link for
* ntpd to find it. To allow building a ntp-keygen.exe which loads on
* ntpd to find it. To allow building a ntpkeygen.exe which loads on
* Windows pre-XP, runtime link to CreateHardLinkA().
*/
int
......
......@@ -5,15 +5,15 @@ def build(ctx):
bldnode = ctx.bldnode.abspath()
ntp_keygen_source = [
"ntp-keygen.c",
"ntpkeygen.c",
]
ctx(
target = "ntp-keygen",
target = "ntpkeygen",
features = "c cprogram bld_include src_include libisc_include",
source = ntp_keygen_source,
includes = [
"%s/ntp-keygen/" % bldnode
"%s/ntpkeygen/" % bldnode
],
use = "ntp opts isc M RT LIBEVENT LIBEVENT_CORE LIBEVENT_PTHREADS PTHREAD CRYPTO",
install_path= "${PREFIX}/bin/"
......
......@@ -15,8 +15,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\ntp-keygen\Debug"
IntermediateDirectory=".\ntp-keygen\Debug"
OutputDirectory=".\ntpkeygen\Debug"
IntermediateDirectory=".\ntpkeygen\Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
......@@ -37,7 +37,7 @@
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\ntp-keygen\Debug/ntpkeygen.tlb"
TypeLibraryName=".\ntpkeygen\Debug/ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
......@@ -48,10 +48,10 @@
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\ntp-keygen\Debug/ntpkeygen.pch"
AssemblerListingLocation=".\ntp-keygen\Debug/"
ObjectFile=".\ntp-keygen\Debug/"
ProgramDataBaseFileName=".\ntp-keygen\Debug/"
PrecompiledHeaderFile=".\ntpkeygen\Debug/ntpkeygen.pch"
AssemblerListingLocation=".\ntpkeygen\Debug/"
ObjectFile=".\ntpkeygen\Debug/"
ProgramDataBaseFileName=".\ntpkeygen\Debug/"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="true"
......@@ -71,11 +71,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib libntp\Debug\libntp.lib"
OutputFile="bin/Debug/ntp-keygen.exe"
OutputFile="bin/Debug/ntpkeygen.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="bin/Debug/ntp-keygen.pdb"
ProgramDatabaseFile="bin/Debug/ntpkeygen.pdb"
SubSystem="1"
TargetMachine="1"
Version="0x0400"
......@@ -92,7 +92,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\ntp-keygen\Debug/ntpkeygen.bsc"
OutputFile=".\ntpkeygen\Debug/ntpkeygen.bsc"
/>
<Tool
Name="VCFxCopTool"
......@@ -109,8 +109,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\ntp-keygen\Release"
IntermediateDirectory=".\ntp-keygen\Release"
OutputDirectory=".\ntpkeygen\Release"
IntermediateDirectory=".\ntpkeygen\Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
......@@ -131,7 +131,7 @@
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\ntp-keygen\Release/ntpkeygen.tlb"
TypeLibraryName=".\ntpkeygen\Release/ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
......@@ -143,10 +143,10 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\ntp-keygen\Release/ntpkeygen.pch"
AssemblerListingLocation=".\ntp-keygen\Release/"
ObjectFile=".\ntp-keygen\Release/"
ProgramDataBaseFileName=".\ntp-keygen\Release/"
PrecompiledHeaderFile=".\ntpkeygen\Release/ntpkeygen.pch"
AssemblerListingLocation=".\ntpkeygen\Release/"
ObjectFile=".\ntpkeygen\Release/"
ProgramDataBaseFileName=".\ntpkeygen\Release/"
WarningLevel="4"
SuppressStartupBanner="true"
/>
......@@ -164,10 +164,10 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib libntp\Release\libntp.lib"
OutputFile="bin/Release/ntp-keygen.exe"
OutputFile="bin/Release/ntpkeygen.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile="bin/Release/ntp-keygen.pdb"
ProgramDatabaseFile="bin/Release/ntpkeygen.pdb"
SubSystem="1"
TargetMachine="1"
Version="0x0400"
......@@ -184,7 +184,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\ntp-keygen\Release/ntpkeygen.bsc"
OutputFile=".\ntpkeygen\Release/ntpkeygen.bsc"
/>
<Tool
Name="VCFxCopTool"
......@@ -230,7 +230,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\util\ntp-keygen-opts.c"
RelativePath="..\..\..\util\ntpkeygen-opts.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -252,7 +252,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\util\ntp-keygen.c"
RelativePath="..\..\..\util\ntpkeygen.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -358,7 +358,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\scripts\mkver.bat -P ntp-keygen&#x0D;&#x0A;"
CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\scripts\mkver.bat -P ntpkeygen&#x0D;&#x0A;"
Outputs="$(ProjectDir)version.c"
/>
</FileConfiguration>
......@@ -367,7 +367,7 @@
>
<Tool
Name="VCCustomBuildTool"
CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\scripts\mkver.bat -P ntp-keygen&#x0D;&#x0A;"
CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\scripts\mkver.bat -P ntpkeygen&#x0D;&#x0A;"
Outputs="$(ProjectDir)version.c"
/>
</FileConfiguration>
......
......@@ -16,7 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdate", "ntpdate\ntpdate.
{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntp-keygen", "ntp-keygen\ntp-keygen.vcproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpkeygen", "ntpkeygen\ntpkeygen.vcproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
ProjectSection(ProjectDependencies) = postProject
{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
EndProjectSection
......
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="ntp-keygen"
Name="ntpkeygen"
ProjectGUID="{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
RootNamespace="ntp-keygen"
RootNamespace="ntpkeygen"
TargetFrameworkVersion="0"
>
<Platforms>
......@@ -37,12 +37,12 @@
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName="$(IntDir)ntp-keygen.tlb"
TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -105,12 +105,12 @@
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName="$(IntDir)ntp-keygen.tlb"
TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -171,12 +171,12 @@
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
TypeLibraryName="$(IntDir)ntp-keygen.tlb"
TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -240,12 +240,12 @@
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
TypeLibraryName="$(IntDir)ntp-keygen.tlb"
TypeLibraryName="$(IntDir)ntpkeygen.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\ntp-keygen;..\..\..\..\ntp-keygen"
AdditionalIncludeDirectories="..\..\ntpkeygen;..\..\..\..\ntpkeygen"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -295,11 +295,11 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\..\..\util\ntp-keygen-opts.c"
RelativePath="..\..\..\..\util\ntpkeygen-opts.c"
>
</File>
<File
RelativePath="..\..\..\..\util\ntp-keygen.c"
RelativePath="..\..\..\..\util\ntpkeygen.c"
>
</File>
<File
......
......@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libntp", "libntp\libntp.vcx
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdate", "ntpdate\ntpdate.vcxproj", "{2789A62E-3F46-44F1-AAF0-816CD23C2911}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntp-keygen", "ntp-keygen\ntp-keygen.vcxproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpkeygen", "ntpkeygen\ntpkeygen.vcxproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpq", "ntpq\ntpq.vcxproj", "{6A92BF14-8931-48B1-A571-DEBE9F190616}"
EndProject
......
......@@ -28,7 +28,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{C88C1FBF-59D2-447F-BF57-0BCA8889028F}</ProjectGuid>
<RootNamespace>ntp-keygen</RootNamespace>
<RootNamespace>ntpkeygen</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
......@@ -100,11 +100,11 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
<TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -120,12 +120,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
<TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -141,11 +141,11 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
<TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -161,12 +161,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
<TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -183,11 +183,11 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
<TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
<TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -204,11 +204,11 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
<TypeLibraryName>$(IntDir)ntp-keygen.tlb</TypeLibraryName>
<TypeLibraryName>$(IntDir)ntpkeygen.tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>..\..\ntp-keygen;..\..\..\..\ntp-keygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\ntpkeygen;..\..\..\..\ntpkeygen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -223,8 +223,8 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\util\ntp-keygen-opts.c" />
<ClCompile Include="..\..\..\..\util\ntp-keygen.c" />
<ClCompile Include="..\..\..\..\util\ntpkeygen-opts.c" />
<ClCompile Include="..\..\..\..\util\ntpkeygen.c" />
<ClCompile Include="version.c" />
</ItemGroup>
<ItemGroup>
......
......@@ -15,10 +15,10 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\util\ntp-keygen-opts.c">
<ClCompile Include="..\..\..\..\util\ntpkeygen-opts.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\util\ntp-keygen.c">
<ClCompile Include="..\..\..\..\util\ntpkeygen.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="version.c">
......
......@@ -11,7 +11,7 @@ lib:: NTP interface package required to query Mode 6 packets
monitoring:: Directory containing perl scripts useful for monitoring
operations
ntp-wait:: Blocks until ntpd is in state 4 (synchronized).
ntpwait:: Blocks until ntpd is in state 4 (synchronized).
Useful at boot time, to delay the boot sequence
until after "ntpd -g" has set the time.
......
== ntp-wait(8) ==
== ntpwait(8) ==
:doctype: manpage
== NAME ==
{ntpwait} - Wait for {ntpd} to stabilize the system clock
@../../docs/includes/ntp-wait-body.txt@
@../../docs/includes/ntpwait-body.txt@
== EXIT STATUS ==
......
# EDIT THIS FILE WITH CAUTION (ntp-wait-opts)
# EDIT THIS FILE WITH CAUTION (ntpwait-opts)
#
# It has been AutoGen-ed June 3, 2015 at 11:53:09 AM by AutoGen 5.18.5
# From the definitions ntp-wait-opts.def
# From the definitions ntpwait-opts.def
# and the template file perlopt
use Getopt::Long qw(GetOptionsFromArray);
......@@ -40,8 +40,8 @@ sub processOptions {
'help|?', 'more-help'));
$usage = <<'USAGE';
ntp-wait - Wait for ntpd to stabilize the system clock.
USAGE: ntp-wait [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
ntpwait - Wait for ntpd to stabilize the system clock.
USAGE: ntpwait [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
-n, --tries=num Number of times to check ntpd
-s, --sleep=num How long to sleep between tries
......
#!/bin/sh
# This script, when run, runs ntp-wait if ntpd is enabled.
# This script, when run, runs ntpwait if ntpd is enabled.
# PROVIDE: ntpwait
......@@ -8,7 +8,7 @@
name="ntpwait"
rcvar="ntpwait_enable"
start_cmd="ntpwait_start"
ntp_wait="/usr/sbin/ntp-wait"
ntp_wait="/usr/sbin/ntpwait"
load_rc_config "$name"
......
......@@ -5,7 +5,7 @@ use Test::Command;
use List::MoreUtils qw(any);
my @script_list = qw(
calc_tickadj/calc_tickadj ntp-wait/ntp-wait ntpsweep/ntpsweep
calc_tickadj/calc_tickadj ntpwait/ntpwait ntpsweep/ntpsweep
ntptrace/ntptrace summary plot_summary
);
......
......@@ -5,7 +5,7 @@ use Test::Command;
use Test::Output;
use Test::Util qw(check_help mock_ntp_util run_mocked override);
my $script_name = 'ntp-wait/ntp-wait';
my $script_name = 'ntpwait/ntpwait';
require_ok($script_name);
......
......@@ -103,14 +103,14 @@ def build(ctx):
ctx.recurse("ntpq")
# ctx.recurse("clockstuff") -
# ctx.recurse("kernel")
ctx.recurse("ntp-keygen")
ctx.recurse("ntpkeygen")
ctx.recurse("util")
# ctx.recurse("unity")
# ctx.recurse("tests")
subst_scripts = [
"scripts/ntp-wait/ntp-wait.in",
"scripts/ntpwait/ntpwait.in",
"scripts/ntpsweep/ntpsweep.in",
"scripts/ntptrace/ntptrace.in",
"scripts/update-leap/update-leap.in"
......@@ -124,11 +124,11 @@ def build(ctx):
)
subst_files = [
"ntp-keygen/ntp-keygen-man.txt.in",
"ntpkeygen/ntpkeygen-man.txt.in",
"ntpd/complete.conf.in",
"ntpd/ntpd-man.txt.in",
"ntpq/ntpq-man.txt.in",
"scripts/ntp-wait/ntp-wait-man.txt.in",
"scripts/ntpwait/ntpwait-man.txt.in",
"scripts/ntptrace/ntptrace-man.txt.in",
"ntpdig/ntpdig-man.txt.in",
"util/ntptickadj-man.txt.in",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment