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

bms_fbsd at users.sourceforge.net bms_fbsd at users.sourceforge.net
Fri Dec 4 07:19:46 PST 2009


Revision: 11676
          http://xorp.svn.sourceforge.net/xorp/?rev=11676&view=rev
Author:   bms_fbsd
Date:     2009-12-04 15:19:46 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
Adjust router manager default paths to match FHS layout.

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

Modified: trunk/xorp/rtrmgr/util.cc
===================================================================
--- trunk/xorp/rtrmgr/util.cc	2009-12-04 14:26:50 UTC (rev 11675)
+++ trunk/xorp/rtrmgr/util.cc	2009-12-04 15:19:46 UTC (rev 11676)
@@ -117,7 +117,7 @@
     if (xr != NULL) {
 	s_bin_root = xr;
 	s_cfg_root = xr;
-	s_boot_file = s_cfg_root + "/rtrmgr/xorp.conf";
+	s_boot_file = s_cfg_root + "/etc/xorp.conf";
 	return;
     }
 
@@ -145,7 +145,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 + "/xorp.conf";
+    s_boot_file = s_cfg_root + "/etc/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());
@@ -167,13 +167,13 @@
 string
 xorp_template_dir()
 {
-    return s_cfg_root + string("/etc/templates");
+    return s_cfg_root + string("/share/xorp/templates");
 }
 
 string
 xorp_xrl_targets_dir()
 {
-    return s_cfg_root + string("/xrl/targets");
+    return s_cfg_root + string("/share/xorp/xrl/targets");
 }
 
 string


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



More information about the Xorp-cvs mailing list