fix test to work with quota mount options too.

diff --git a/028 b/028
index e8bf4d2d851cf0b2be3f7e43d02f5752dab686a5..01cacda93a44d19299b50f97e79840dff68becf6 100755 (executable)
--- a/028
+++ b/028
@@ -56,6 +56,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # wipe test dir clean first
 # so dump can be real quick
 _wipe_fs
+_setup_seq_out
 
 #
 # Create 5 dumps

diff --git a/028.out b/028.out
index f3e8c120a4a67d7bf2d107d7b93b65e5bebec009..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/028.out
+++ b/028.out
@@ -1,323 +0,0 @@
-QA output created by 028
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.0 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.0"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: /var/xfsdump/inventory created
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.1 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.1"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.2 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.2"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.3 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.3"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.4 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.4"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-file system 0:
-       fs id: ID
-       session 0:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.0"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 1:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.1"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 2:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.2"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 3:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.3"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 4:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.4"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-Processing file /var/xfsdump/inventory/UUIDstab
-   Found entry for HOSTNAME:SCRATCH_MNT
-      processing index file 
-       /var/xfsdump/inventory/UUID.InvIndex
-         Checking access for
-          /var/xfsdump/inventory/UUID.StObj
-          Mount point match
-            Session 0: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-Pruning this matching entry:
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-LABEL          :       session.0
-TIME OF DUMP   :       TIME
--------------------------------------------------
-
-            Session 1: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-Pruning this matching entry:
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-LABEL          :       session.1
-TIME OF DUMP   :       TIME
--------------------------------------------------
-
-            Session 2: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-Pruning this matching entry:
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-LABEL          :       session.2
-TIME OF DUMP   :       TIME
--------------------------------------------------
-
-            Session 3: HOSTNAME:SCRATCH_MNT
-            Session 4: HOSTNAME:SCRATCH_MNT
-file system 0:
-       fs id: ID
-       session 0:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.3"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 1:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.4"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID

diff --git a/047 b/047
index 2d0adcc5c203378e9605278d053cc823311456cf..bbb740d68af83c8cb1e50c068fca279a003dae1f 100755 (executable)
--- a/047
+++ b/047
@@ -56,6 +56,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # wipe test dir clean first
 # so dump can be real quick
 _wipe_fs
+_setup_seq_out
 
 #
 # Create 5 dumps

diff --git a/047.out b/047.out
index 7dd34d5db2fecc538274bbd6b2da4b409ccf1f3b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/047.out
+++ b/047.out
@@ -1,347 +0,0 @@
-QA output created by 047
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.0 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.0"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: /var/xfsdump/inventory created
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.1 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.1"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.2 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.2"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.3 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.3"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-Dumping to file...
-xfsdump  -f DUMP_FILE -M stress_tape_media -L session.4 SCRATCH_MNT
-xfsdump: version 3.0 - Running single-threaded
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "session.4"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: creating dump session media file 0 (media 0, file 0)
-xfsdump: dumping ino map
-xfsdump: dumping directories
-xfsdump: dumping non-directory files
-xfsdump: ending media file
-xfsdump: media file size NUM bytes
-xfsdump: dump size (non-dir files) : 0 bytes
-xfsdump: dump complete: SECS seconds elapsed
-file system 0:
-       fs id: ID
-       session 0:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.0"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 1:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.1"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 2:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.2"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 3:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.3"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 4:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.4"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-Processing file /var/xfsdump/inventory/UUIDstab
-   Found entry for HOSTNAME:SCRATCH_MNT
-      processing index file 
-       /var/xfsdump/inventory/UUID.InvIndex
-         Checking access for
-          /var/xfsdump/inventory/UUID.StObj
-          Mount point match
-            Session 0: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-An entry matching the mount point/time is :
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-TIME OF DUMP   :       TIME
-
-Do you want to prune this entry: [y/n] -------------------------------------------------
-
-            Session 1: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-An entry matching the mount point/time is :
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-TIME OF DUMP   :       TIME
-
-Do you want to prune this entry: [y/n] -------------------------------------------------
-
-            Session 2: HOSTNAME:SCRATCH_MNT
--------------------------------------------------
-An entry matching the mount point/time is :
-UUID           :       ID
-MOUNT POINT    :       HOSTNAME:SCRATCH_MNT
-DEV PATH       :       HOSTNAME:SCRATCH_DEV
-TIME OF DUMP   :       TIME
-
-Do you want to prune this entry: [y/n] -------------------------------------------------
-
-            Session 3: HOSTNAME:SCRATCH_MNT
-            Session 4: HOSTNAME:SCRATCH_MNT
-file system 0:
-       fs id: ID
-       session 0:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.0"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 1:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.3"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID
-       session 2:
-               mount point:    HOSTNAME:SCRATCH_MNT
-               device:         HOSTNAME:SCRATCH_DEV
-               time: TIME
-               session label:  "session.4"
-               session id: ID
-               level:          0
-               resumed:        NO
-               subtree:        NO
-               streams:        1
-               stream 0:
-                       pathname:       DUMP_FILE
-                       start:          ino 0 offset 0
-                       end:            ino 1 offset 0
-                       interrupted:    NO
-                       media files:    1
-                       media file 0:
-                               mfile index:    0
-                               mfile type:     data
-                               mfile size:     21016
-                               mfile start:    ino 0 offset 0
-                               mfile end:      ino 1 offset 0
-                               media label:    "stress_tape_media"
-                               media id: ID

diff --git a/common.dump b/common.dump
index 76de90618ca72f0e44f6033d06061b07ad9f1d6b..bf891ebb02c550611daabc9e886a9f34e7b07fe1 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -639,9 +639,11 @@ _dump_filter()
       -e 's/dump begun .*/dump begun DATE/'    \
       -e 's/[0-9][0-9]* seconds/SECS seconds/' \
       -e 's/restore.[0-9][0-9]*/restore.PID/' \
+      -e 's/ino [0-9][0-9]*/ino INO/' \
       -e '/: dump size/s/[1-9][0-9]*/NUM/'     \
       -e '/dump size:/s/[1-9][0-9]*/NUM/'      \
       -e '/media file size/s/[1-9][0-9]*/NUM/' \
+      -e '/mfile size:[         ]*/s/[1-9][0-9]*/NUM/' \
       -e '/\/dev\/tty/d' \
       -e '/inventory session uuid/d' \