diff --git a/test/basic-images.test b/test/basic-images.test index 42b3a0c..b6516c9 100755 --- a/test/basic-images.test +++ b/test/basic-images.test @@ -89,10 +89,9 @@ compare_label() { check_ext() { [ "$verbose" = "t" ] && set -x compare_label "$(e2label "${1}")" "${2}" && - e2fsck -nf "${1}" && - tune2fs -U 12345678-1234-1234-1234-1234567890ab "${1}" && - dumpe2fs "${1}" | grep -v '^\(Directory Hash Seed:\|Last write time:\|Last checked:\)' > "dump" && + dumpe2fs "${1}" | grep -v '^\(Filesystem UUID\|Directory Hash Seed:\|Group 0: (Blocks 1-4095) csum\)' > "dump" && test_cmp "${testdir}/${2}.dump" "dump" && + e2fsck -nf "${1}" && debugfs -R "rdump / \"${root_test}\"" "${1}" && rmdir "${root_test}/lost+found" && check_root diff --git a/test/ext2.config b/test/ext2.config index f678175..3c6e57f 100644 --- a/test/ext2.config +++ b/test/ext2.config @@ -1,6 +1,7 @@ image test.ext2 { ext2 { label = "ext2test" + fs-timestamp = "20000101" } size = 4M } diff --git a/test/ext2test.dump b/test/ext2test.dump index 2b1b01e..b961a49 100644 --- a/test/ext2test.dump +++ b/test/ext2test.dump @@ -1,6 +1,5 @@ Filesystem volume name: ext2test Last mounted on: -Filesystem UUID: 12345678-1234-1234-1234-1234567890ab Filesystem magic number: 0xEF53 Filesystem revision #: 0 (original) Filesystem features: (none) @@ -20,9 +19,12 @@ Blocks per group: 4096 Fragments per group: 4096 Inodes per group: 256 Inode blocks per group: 32 +Filesystem created: Sat Jan 1 00:00:00 2000 Last mount time: n/a +Last write time: Sat Jan 1 00:00:00 2000 Mount count: 0 Maximum mount count: 20 +Last checked: Sat Jan 1 00:00:00 2000 Check interval: 0 () Reserved blocks uid: 0 (user root) Reserved blocks gid: 0 (group root) diff --git a/test/ext3.config b/test/ext3.config index 3d2e316..eb290b6 100644 --- a/test/ext3.config +++ b/test/ext3.config @@ -1,6 +1,7 @@ image test.ext3 { ext3 { label = "ext3test" + fs-timestamp = "20000101" } size = 4M } diff --git a/test/ext3test.dump b/test/ext3test.dump index 38418eb..ec7ef07 100644 --- a/test/ext3test.dump +++ b/test/ext3test.dump @@ -1,6 +1,5 @@ Filesystem volume name: ext3test Last mounted on: -Filesystem UUID: 12345678-1234-1234-1234-1234567890ab Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) Filesystem features: has_journal @@ -20,9 +19,12 @@ Blocks per group: 4096 Fragments per group: 4096 Inodes per group: 256 Inode blocks per group: 32 +Filesystem created: Sat Jan 1 00:00:00 2000 Last mount time: n/a +Last write time: Sat Jan 1 00:00:00 2000 Mount count: 0 Maximum mount count: 20 +Last checked: Sat Jan 1 00:00:00 2000 Check interval: 0 () Reserved blocks uid: 0 (user root) Reserved blocks gid: 0 (group root) diff --git a/test/ext4.config b/test/ext4.config index 41a8f4c..b1c0536 100644 --- a/test/ext4.config +++ b/test/ext4.config @@ -1,6 +1,7 @@ image test.ext4 { ext4 { label = "ext4test" + fs-timestamp = "20000101" } size = 4M } diff --git a/test/ext4test.dump b/test/ext4test.dump index 978a50d..76284dd 100644 --- a/test/ext4test.dump +++ b/test/ext4test.dump @@ -1,6 +1,5 @@ Filesystem volume name: ext4test Last mounted on: -Filesystem UUID: 12345678-1234-1234-1234-1234567890ab Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) Filesystem features: has_journal dir_index extent uninit_bg @@ -21,9 +20,12 @@ Blocks per group: 4096 Fragments per group: 4096 Inodes per group: 256 Inode blocks per group: 32 +Filesystem created: Sat Jan 1 00:00:00 2000 Last mount time: n/a +Last write time: Sat Jan 1 00:00:00 2000 Mount count: 0 Maximum mount count: 20 +Last checked: Sat Jan 1 00:00:00 2000 Check interval: 0 () Reserved blocks uid: 0 (user root) Reserved blocks gid: 0 (group root) @@ -39,7 +41,6 @@ Journal sequence: 0x00000001 Journal start: 0 -Group 0: (Blocks 1-4095) csum 0xef42 [ITABLE_ZEROED] Primary superblock at 1, Group descriptors at 2-2 Block bitmap at 3 (+2) Inode bitmap at 4 (+3)