Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+3 -1
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 056
# FS QA Test No. 056
#
# Test xfsdump/xfsrestore to a dump file (as opposed to a tape)
# and test restoring various permissions/modes
@@ -52,6 +52,8 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.dump
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_create_dumpdir_fill_perm
_do_dump_file