diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 1 | ||||
| -rw-r--r-- | extras/geo-rep/gsync-sync-gfid.c | 7 | ||||
| -rwxr-xr-x | extras/hook-scripts/S30samba-set.sh | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 593f850ac..b82c65f02 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -15,6 +15,7 @@ prep: if [ ! -e $(GFS_TAR) ]; then \ $(MAKE) -C ../.. dist; \ fi + -mkdir -p rpmbuild/BUILD -mkdir -p rpmbuild/SPECS -mkdir -p rpmbuild/RPMS -mkdir -p rpmbuild/SRPMS diff --git a/extras/geo-rep/gsync-sync-gfid.c b/extras/geo-rep/gsync-sync-gfid.c index 601f4720e..953eb5351 100644 --- a/extras/geo-rep/gsync-sync-gfid.c +++ b/extras/geo-rep/gsync-sync-gfid.c @@ -4,10 +4,11 @@ #include <string.h> #include <limits.h> #include <sys/types.h> -#include <attr/xattr.h> #include <libgen.h> #include <ctype.h> #include <stdlib.h> +#include "glusterfs.h" +#include "syscall.h" #ifndef UUID_CANONICAL_FORM_LEN #define UUID_CANONICAL_FORM_LEN 36 @@ -86,8 +87,8 @@ main (int argc, char *argv[]) memcpy (tmp_blob, bname, strlen (bname)); - ret = setxattr (parent_dir, GF_FUSE_AUX_GFID_HEAL, blob, len, - 0); + ret = sys_lsetxattr (parent_dir, GF_FUSE_AUX_GFID_HEAL, + blob, len, 0); if (ret < 0) { fprintf (stderr, "setxattr on %s/%s failed (%s)\n", parent_dir, bname, strerror (errno)); diff --git a/extras/hook-scripts/S30samba-set.sh b/extras/hook-scripts/S30samba-set.sh index 6b11f5a4f..2fc65c278 100755 --- a/extras/hook-scripts/S30samba-set.sh +++ b/extras/hook-scripts/S30samba-set.sh @@ -65,7 +65,7 @@ function add_samba_share () { STRING+="glusterfs:volume = $volname\n" STRING+="glusterfs:logfile = /var/log/samba/glusterfs-$volname.%%M.log\n" STRING+="glusterfs:loglevel = 7\n" - STRING+="path = /\n" + STRING+="path = %%P/\n" STRING+="read only = no\n" STRING+="guest ok = yes\n" printf "$STRING" >> /etc/samba/smb.conf |