From 3fb9ee6caa3325423ac221b5f24e980c24edafde Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Mon, 26 Mar 2012 12:27:12 -0400 Subject: Save old volfiles in the RPM standard way. I just got bitten by this again. It appears that the previously merged fix was inadvertently reverted by a subsequent change. Change-Id: I3a2067ee891fd5b8be0cd6cee58dcbc8cb6005e9 BUG: 764702 Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.com/3009 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- glusterfs.spec.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 7b3cdb056ca..23ef8fae21f 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -296,9 +296,12 @@ if [ -d /etc/glusterd ]; then fi if [ -d /var/lib/glusterd/vols ]; then - #for each dir under vols, backup non-fuse .vol files as .Vol.old - for file in `find /var/lib/glusterd/vols -type f ! -name *-fuse.vol `; do - grep ".vol" $file &> /dev/null && fname=`basename $file .vol` && dname=`dirname $file` && cp $file $dname/$fname.Vol.old + # Rename old volfiles in an RPM-standard way. These aren't actually + # considered package config files, so %config doesn't work for them. + for file in $(find /var/lib/glusterd/vols -name '*.vol'); do + newfile=${file}.rpmsave + echo "warning: ${file} saved as ${newfile}" + cp ${file} ${newfile} done fi -- cgit