Merge of xfs-cmds-2.4.18:slinx:112376a by nathans.

  force text encoding to be used to overcome AndreasG print heuristics.

diff --git a/020 b/020
index a5f99d01e4f5099b06923b2aa9ab5049a35d65b2..780101048938b897e04326e0377e7d57ac1f44d6 100755 (executable)
--- a/020
+++ b/020
@@ -81,7 +81,7 @@ _attr_list()
     file=$1
     
     echo "   *** print attributes"
-    if ! _getfattr -ad $file
+    if ! _getfattr -ad -e text $file
     then
         echo "      !!! error return"
         return 1

diff --git a/062 b/062
index 6034f45bcf58f3ba4b0ca5080fe5e0d5d1d07021..f5cc40c05d30b2592c52919f060ac9573d7b2d8f 100755 (executable)
--- a/062
+++ b/062
@@ -190,7 +190,7 @@ echo; echo
 _backup()
 {
        # NB: no filtering of scratch here... (need to restore too)
-       /usr/bin/getfattr -adl -sR $SCRATCH_MNT >$1
+       /usr/bin/getfattr -adl -R -r '^user|^system' $SCRATCH_MNT >$1
        echo BACKUP $1 >>$seq.full
        cat $1 >> $seq.full
        [ ! -s $1 ] && echo "warning: $1 (backup file) is empty"