From: Mukund Sivaraman Date: Wed, 30 May 2012 05:48:41 +0000 (+0530) Subject: [1890] Clarify message shown when command to clear the config file is used X-Git-Tag: trac2351_base~226^2~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8cabc67f199b59704c0064521ddd6fdaeb438d1;p=thirdparty%2Fkea.git [1890] Clarify message shown when command to clear the config file is used --- diff --git a/src/bin/bind10/bind10.8 b/src/bin/bind10/bind10.8 index 8d6e5edd12..9e085e31cd 100644 --- a/src/bin/bind10/bind10.8 +++ b/src/bin/bind10/bind10.8 @@ -42,7 +42,7 @@ b10\-config\&.db\&. .RS 4 This will create a backup of the existing configuration file, remove it and start 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 .PP \fB\-\-cmdctl\-port\fR \fIport\fR diff --git a/src/bin/bind10/bind10.xml b/src/bin/bind10/bind10.xml index 60449de8bd..40537830ec 100644 --- a/src/bin/bind10/bind10.xml +++ b/src/bin/bind10/bind10.xml @@ -116,7 +116,7 @@ b10-cfgmgr8 with the default configuration. The name of the backup file can be found in the logs - (CFGMGR_RENAMED_CONFIG_FILE). + (CFGMGR_BACKED_UP_CONFIG_FILE). (It will append a number to the backup filename if a previous backup file exists.) diff --git a/src/bin/cfgmgr/b10-cfgmgr.8 b/src/bin/cfgmgr/b10-cfgmgr.8 index 0524d9bf8c..83f7b7dc4b 100644 --- a/src/bin/cfgmgr/b10-cfgmgr.8 +++ b/src/bin/cfgmgr/b10-cfgmgr.8 @@ -54,7 +54,7 @@ The arguments are as follows: .RS 4 This will create a backup of the existing configuration file, remove it, and 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 .PP \fB\-c\fR \fIconfig\-filename\fR, \fB\-\-config\-filename\fR \fIconfig\-filename\fR diff --git a/src/bin/cfgmgr/b10-cfgmgr.xml b/src/bin/cfgmgr/b10-cfgmgr.xml index f8d590b7cd..202ea09e8d 100644 --- a/src/bin/cfgmgr/b10-cfgmgr.xml +++ b/src/bin/cfgmgr/b10-cfgmgr.xml @@ -107,7 +107,7 @@ b10-cfgmgr8 will use the default configurations. The name of the backup file can be found in the logs - (CFGMGR_RENAMED_CONFIG_FILE). + (CFGMGR_BACKED_UP_CONFIG_FILE). (It will append a number to the backup filename if a previous backup file exists.) diff --git a/src/lib/python/isc/config/cfgmgr.py b/src/lib/python/isc/config/cfgmgr.py index 23e627e0a1..aa0547b25c 100644 --- a/src/lib/python/isc/config/cfgmgr.py +++ b/src/lib/python/isc/config/cfgmgr.py @@ -167,7 +167,7 @@ class ConfigManagerData: i += 1 new_file_name = new_file_name + "." + str(i) 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) def __eq__(self, other): diff --git a/src/lib/python/isc/config/cfgmgr_messages.mes b/src/lib/python/isc/config/cfgmgr_messages.mes index e6085948d9..e6cb352445 100644 --- a/src/lib/python/isc/config/cfgmgr_messages.mes +++ b/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 configuration is not stored. -% CFGMGR_RENAMED_CONFIG_FILE renamed configuration file %1 to %2, will create new %1 -BIND 10 has been started with the command to clear the configuration file. -The existing file is backed up to the given file name, so that data is not -immediately lost if this was done by accident. +% 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. The existing file has been backed up (moved) to the given file +name. A new configuration file will be created in the original location +when necessary. % CFGMGR_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down There was a keyboard interrupt signal to stop the cfgmgr daemon. The