[Ocfs2-tools-commits] jlbec commits r776 - in trunk: libo2cb libo2cb/include ocfs2console/ocfs2interface vendor/common

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-03-30 20:26:54 -0600 (Wed, 30 Mar 2005)
New Revision: 776

Modified:
   trunk/libo2cb/include/o2cb_abi.h
   trunk/libo2cb/o2cb_abi.c
   trunk/ocfs2console/ocfs2interface/clconfig.py
   trunk/vendor/common/o2cb.init
Log:

o Move from /usys to /config.  Why not?



Modified: trunk/libo2cb/include/o2cb_abi.h
===================================================================
--- trunk/libo2cb/include/o2cb_abi.h	2005-03-31 02:06:35 UTC (rev 775)
+++ trunk/libo2cb/include/o2cb_abi.h	2005-03-31 02:26:54 UTC (rev 776)
@@ -25,9 +25,9 @@
 #ifndef _O2CB_ABI_H
 #define _O2CB_ABI_H
 
-#define USYSFS_PATH "/usys"
+#define CONFIGFS_PATH "/config"
 
-#define O2CB_FORMAT_CLUSTER_DIR		USYSFS_PATH "/cluster"
+#define O2CB_FORMAT_CLUSTER_DIR		CONFIGFS_PATH "/cluster"
 #define O2CB_FORMAT_CLUSTER		O2CB_FORMAT_CLUSTER_DIR "/%s"
 #define O2CB_FORMAT_NODE_DIR		O2CB_FORMAT_CLUSTER "/node"
 #define O2CB_FORMAT_NODE		O2CB_FORMAT_NODE_DIR "/%s"

Modified: trunk/libo2cb/o2cb_abi.c
===================================================================
--- trunk/libo2cb/o2cb_abi.c	2005-03-31 02:06:35 UTC (rev 775)
+++ trunk/libo2cb/o2cb_abi.c	2005-03-31 02:26:54 UTC (rev 776)
@@ -43,8 +43,6 @@
 
 #include "o2cb_abi.h"
 
-#define USYSFS_PREFIX "/usys"
-
 errcode_t o2cb_create_cluster(const char *cluster_name)
 {
 	char path[PATH_MAX];

Modified: trunk/ocfs2console/ocfs2interface/clconfig.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/clconfig.py	2005-03-31 02:06:35 UTC (rev 775)
+++ trunk/ocfs2console/ocfs2interface/clconfig.py	2005-03-31 02:26:54 UTC (rev 776)
@@ -31,7 +31,7 @@
 from ipwidget import IPEditor, IPMissing, IPError
 
 CLUSTER_NAME = 'ocfs2'
-CONFIG_FS_PATH = '/usys/cluster'
+CONFIG_FS_PATH = '/config/cluster'
 
 O2CB_INIT = '/etc/init.d/o2cb'
 O2CB_CTL = 'o2cb_ctl'

Modified: trunk/vendor/common/o2cb.init
===================================================================
--- trunk/vendor/common/o2cb.init	2005-03-31 02:06:35 UTC (rev 775)
+++ trunk/vendor/common/o2cb.init	2005-03-31 02:26:54 UTC (rev 776)
@@ -22,7 +22,7 @@
 
 # XXX some description of what this does
 LOAD_ACTIONS=("load_module configfs"
-		"mount_fs configfs /usys"
+		"mount_fs configfs /config"
 		"load_module ocfs2_nodemanager"
 		"load_module ocfs2_dlmfs"
 		"mount_fs ocfs2_dlmfs /dlm")