diff options
| author | Raghavendra Bhat <raghavendra@redhat.com> | 2012-06-12 19:17:41 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-07-04 00:18:42 -0700 |
| commit | 96e24e01fa01144e784597c9dc3648c78da78a61 (patch) | |
| tree | 2ce5fd6636d3c01188f26a09ec22990f6eecaa7c | |
| parent | 34a06d3c13aba1a22680e070b08284f2d7c69890 (diff) | |
glusterd: copy /etc/glusterd to /var/lib and remove /etc/glusterd instead of
moving
* Change default directory from /etc/glusterd to /var/lib/glusterd
Change-Id: Iefa82e4fdb94ce5a84dfb40855c80e16e9ffcc40
BUG: 830218
Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-on: http://review.gluster.com/3548
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index dd584b8252f..7b45825afd4 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -308,7 +308,8 @@ fi # Move legacy sysconf files to the correct sysconfdir if [ -d /etc/glusterd ]; then mkdir -p /var/lib - mv /etc/glusterd /var/lib/ + cp -a /etc/glusterd /var/lib + rm -rf /etc/glusterd ln -sf /var/lib/glusterd /etc/glusterd fi diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index a774c55c7cb..7afbd53f199 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -282,7 +282,7 @@ enum glusterd_vol_comp_status_ { GLUSTERD_VOL_COMP_RJT, }; -#define GLUSTERD_DEFAULT_WORKDIR "/etc/glusterd" +#define GLUSTERD_DEFAULT_WORKDIR "/var/lib/glusterd" #define GLUSTERD_DEFAULT_PORT GF_DEFAULT_BASE_PORT #define GLUSTERD_INFO_FILE "glusterd.info" #define GLUSTERD_VOLUME_DIR_PREFIX "vols" |