Browse Source

[1890] Clarify message shown when command to clear the config file is used

Mukund Sivaraman 13 years ago
parent
commit
e8cabc67f1

+ 1 - 1
src/bin/bind10/bind10.8

@@ -42,7 +42,7 @@ b10\-config\&.db\&.
 .RS 4
 .RS 4
 This will create a backup of the existing configuration file, remove it and start
 This will create a backup of the existing configuration file, remove it and start
 b10\-cfgmgr(8)
 b10\-cfgmgr(8)
-with the default configuration\&. The name of the backup file can be found in the logs (\fICFGMGR_RENAMED_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
+with the default configuration\&. The name of the backup file can be found in the logs (\fICFGMGR_BACKED_UP_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
 .RE
 .RE
 .PP
 .PP
 \fB\-\-cmdctl\-port\fR \fIport\fR
 \fB\-\-cmdctl\-port\fR \fIport\fR

+ 1 - 1
src/bin/bind10/bind10.xml

@@ -116,7 +116,7 @@
 	    <refentrytitle>b10-cfgmgr</refentrytitle><manvolnum>8</manvolnum>
 	    <refentrytitle>b10-cfgmgr</refentrytitle><manvolnum>8</manvolnum>
             with the default configuration.
             with the default configuration.
 	    The name of the backup file can be found in the logs
 	    The name of the backup file can be found in the logs
-	    (<varname>CFGMGR_RENAMED_CONFIG_FILE</varname>).
+	    (<varname>CFGMGR_BACKED_UP_CONFIG_FILE</varname>).
 	    (It will append a number to the backup filename if a
 	    (It will append a number to the backup filename if a
 	    previous backup file exists.)
 	    previous backup file exists.)
 
 

+ 1 - 1
src/bin/cfgmgr/b10-cfgmgr.8

@@ -54,7 +54,7 @@ The arguments are as follows:
 .RS 4
 .RS 4
 This will create a backup of the existing configuration file, remove it, and
 This will create a backup of the existing configuration file, remove it, and
 b10\-cfgmgr(8)
 b10\-cfgmgr(8)
-will use the default configurations\&. The name of the backup file can be found in the logs (\fICFGMGR_RENAMED_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
+will use the default configurations\&. The name of the backup file can be found in the logs (\fICFGMGR_BACKED_UP_CONFIG_FILE\fR)\&. (It will append a number to the backup filename if a previous backup file exists\&.)
 .RE
 .RE
 .PP
 .PP
 \fB\-c\fR \fIconfig\-filename\fR, \fB\-\-config\-filename\fR \fIconfig\-filename\fR
 \fB\-c\fR \fIconfig\-filename\fR, \fB\-\-config\-filename\fR \fIconfig\-filename\fR

+ 1 - 1
src/bin/cfgmgr/b10-cfgmgr.xml

@@ -107,7 +107,7 @@
             <refentrytitle>b10-cfgmgr</refentrytitle><manvolnum>8</manvolnum>
             <refentrytitle>b10-cfgmgr</refentrytitle><manvolnum>8</manvolnum>
             will use the default configurations.
             will use the default configurations.
             The name of the backup file can be found in the logs
             The name of the backup file can be found in the logs
-            (<varname>CFGMGR_RENAMED_CONFIG_FILE</varname>).
+            (<varname>CFGMGR_BACKED_UP_CONFIG_FILE</varname>).
             (It will append a number to the backup filename if a
             (It will append a number to the backup filename if a
             previous backup file exists.)
             previous backup file exists.)
           </para>
           </para>

+ 1 - 1
src/lib/python/isc/config/cfgmgr.py

@@ -167,7 +167,7 @@ class ConfigManagerData:
                 i += 1
                 i += 1
             new_file_name = new_file_name + "." + str(i)
             new_file_name = new_file_name + "." + str(i)
         if os.path.exists(old_file_name):
         if os.path.exists(old_file_name):
-            logger.info(CFGMGR_RENAMED_CONFIG_FILE, old_file_name, new_file_name)
+            logger.info(CFGMGR_BACKED_UP_CONFIG_FILE, old_file_name, new_file_name)
             os.rename(old_file_name, new_file_name)
             os.rename(old_file_name, new_file_name)
 
 
     def __eq__(self, other):
     def __eq__(self, other):

+ 5 - 4
src/lib/python/isc/config/cfgmgr_messages.mes

@@ -55,10 +55,11 @@ error is given. The most likely cause is that the system does not have
 write access to the configuration database file. The updated
 write access to the configuration database file. The updated
 configuration is not stored.
 configuration is not stored.
 
 
-% CFGMGR_RENAMED_CONFIG_FILE renamed configuration file %1 to %2, will create new %1
+% CFGMGR_BACKED_UP_CONFIG_FILE Config file %1 was removed; a backup was made at %2
-BIND 10 has been started with the command to clear the configuration file.
+BIND 10 has been started with the command to clear the configuration
-The existing file is backed up to the given file name, so that data is not
+file.  The existing file has been backed up (moved) to the given file
-immediately lost if this was done by accident.
+name. A new configuration file will be created in the original location
+when necessary.
 
 
 % CFGMGR_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
 % CFGMGR_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
 There was a keyboard interrupt signal to stop the cfgmgr daemon. The
 There was a keyboard interrupt signal to stop the cfgmgr daemon. The