From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 17 Oct 2009 15:38:06 +0000 (+0200)
Subject: Use getfattr and setfattr on Linux not attr as that is a XFS tool which works too... 
X-Git-Tag: Release-7.0.0~2599^2~9^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ee711f2e7b445b00de916f5712c59749afc2407;p=bacula%2Fbacula

Use getfattr and setfattr on Linux not attr as that is a XFS tool which works too but is not native.
---

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index 3a28ab2a2a..76143df227 100755
--- a/regress/tests/acl-xattr-test
+++ b/regress/tests/acl-xattr-test
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Run a backup of the Bacula build directory with some acls
-#   then restore it.
+# Run a backup of the Bacula build directory with some acls then restore it.
 #
 # Your filesystem must be mounted with the acl option (mount -o remount,acl,user_xattr /tmp)
 # on ubuntu, the attr package must be installed
@@ -26,10 +25,10 @@ case `uname -s` in
         exit 0
       fi
 
-      # Require attr to be installed
-      attr -l Makefile 2>&1 >/dev/null
+      # Require getfattr to be installed
+      getfattr -d Makefile 2>&1 >/dev/null
       if test $? -ne 0; then
-        echo "$TestName skipped: attr not installed"
+        echo "$TestName skipped: getfattr not installed"
         exit 0
       fi
       ;;
@@ -73,11 +72,11 @@ case `uname -s` in
       setfacl -m group:nogroup:--x $d/bconsole
       cp ${cwd}/bin/bconsole $d/acl-dir
       cp ${cwd}/bin/bconsole $d/other
-      attr -s bacula.test -V rulez $d/other 2>/dev/null 1>/dev/null
+      setfattr -h -n user.bacula.test -v rulez $d/other 2>/dev/null 1>/dev/null
 
       ( cd $cwd/build
         getfacl -R acl > $cwd/tmp/org
-        attr -g bacula.test $d/other > $cwd/tmp/attr.org
+        getfattr -h -n user.bacula.test $d/other > $cwd/tmp/attr.org
       )
       ;;
    Darwin)
@@ -157,7 +156,7 @@ case `uname -s` in
    Linux)
       ( cd $cwd/tmp/bacula-restores/$cwd/build
         getfacl -R acl > $cwd/tmp/new
-        attr -g bacula.test $d/other > $cwd/tmp/attr.new
+        getfattr -h -n user.bacula.test $d/other > $cwd/tmp/attr.new
       )
       ;;
    Darwin)