[Xorp-cvs] SF.net SVN: xorp:[11654] trunk/xorp/rtrmgr/util.cc

[bms_fbsd at users.sourceforge.net]

Revision: 11654
          http://xorp.svn.sourceforge.net/xorp/?rev=11654&view=rev
Author:   bms_fbsd
Date:     2009-12-03 17:09:29 +0000 (Thu, 03 Dec 2009)

Log Message:
-----------
Change default configuration filename from 'config.boot' to 'xorp.conf'.

Modified Paths:
--------------
    trunk/xorp/rtrmgr/util.cc

Modified: trunk/xorp/rtrmgr/util.cc
===================================================================
--- trunk/xorp/rtrmgr/util.cc	2009-12-03 17:04:58 UTC (rev 11653)
+++ trunk/xorp/rtrmgr/util.cc	2009-12-03 17:09:29 UTC (rev 11654)
@@ -134,7 +134,7 @@
     if (xr != NULL) {
 	s_bin_root = xr;
 	s_cfg_root = xr;
-	s_boot_file = s_cfg_root + "/rtrmgr/config.boot";
+	s_boot_file = s_cfg_root + "/rtrmgr/xorp.conf";
 	return;
     }
 
@@ -150,7 +150,7 @@
     if (current_root == build_root) {
 	s_bin_root = build_root;
 	s_cfg_root = xorp_real_path(XORP_SRC_ROOT);
-	s_boot_file = s_cfg_root + "/rtrmgr/config.boot";
+	s_boot_file = s_cfg_root + "/rtrmgr/xorp.conf";
 
 	debug_msg("s_bin_root:   %s\n", s_bin_root.c_str());
 	debug_msg("s_cfg_root:   %s\n", s_cfg_root.c_str());
@@ -162,7 +162,7 @@
     string install_root = xorp_real_path(XORP_INSTALL_ROOT);
     s_bin_root = install_root;
     s_cfg_root = install_root;
-    s_boot_file = s_cfg_root + "/config.boot";
+    s_boot_file = s_cfg_root + "/xorp.conf";
 
     debug_msg("s_bin_root:   %s\n", s_bin_root.c_str());
     debug_msg("s_cfg_root:   %s\n", s_cfg_root.c_str());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.