diff options
Diffstat (limited to 'tests/expected/blkid')
25 files changed, 159 insertions, 24 deletions
diff --git a/tests/expected/blkid/low-probe-cramfs b/tests/expected/blkid/low-probe-cramfs index 09ad018c..7898a367 100644 --- a/tests/expected/blkid/low-probe-cramfs +++ b/tests/expected/blkid/low-probe-cramfs @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=test-cram ID_FS_LABEL=test-cram +ID_FS_LABEL_ENC=test-cram ID_FS_TYPE=cramfs ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-ext2 b/tests/expected/blkid/low-probe-ext2 index fa70cf4f..c70b8569 100644 --- a/tests/expected/blkid/low-probe-ext2 +++ b/tests/expected/blkid/low-probe-ext2 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-ext2 ID_FS_LABEL=test-ext2 +ID_FS_LABEL_ENC=test-ext2 ID_FS_TYPE=ext2 ID_FS_USAGE=filesystem ID_FS_UUID=22f0eac3-5c89-4ec1-9076-60799119aaea diff --git a/tests/expected/blkid/low-probe-ext3 b/tests/expected/blkid/low-probe-ext3 index 43aeeeda..4bac43f5 100644 --- a/tests/expected/blkid/low-probe-ext3 +++ b/tests/expected/blkid/low-probe-ext3 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-ext3 ID_FS_LABEL=test-ext3 +ID_FS_LABEL_ENC=test-ext3 ID_FS_SEC_TYPE=ext2 ID_FS_TYPE=ext3 ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-fat b/tests/expected/blkid/low-probe-fat index 3aecdb45..42012111 100644 --- a/tests/expected/blkid/low-probe-fat +++ b/tests/expected/blkid/low-probe-fat @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TEST-FAT ID_FS_LABEL=TEST-FAT +ID_FS_LABEL_ENC=TEST-FAT ID_FS_SEC_TYPE=msdos ID_FS_TYPE=vfat ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-gfs2 b/tests/expected/blkid/low-probe-gfs2 index a19789ef..cd5a664b 100644 --- a/tests/expected/blkid/low-probe-gfs2 +++ b/tests/expected/blkid/low-probe-gfs2 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=mycluster:mygfs2 ID_FS_LABEL=mycluster:mygfs2 +ID_FS_LABEL_ENC=mycluster:mygfs2 ID_FS_TYPE=gfs2 ID_FS_USAGE=filesystem ID_FS_VERSION=1 diff --git a/tests/expected/blkid/low-probe-hpfs b/tests/expected/blkid/low-probe-hpfs index f0711555..47ae1af2 100644 --- a/tests/expected/blkid/low-probe-hpfs +++ b/tests/expected/blkid/low-probe-hpfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=P01\x20S16A ID_FS_LABEL=P01_S16A +ID_FS_LABEL_ENC=P01\x20S16A ID_FS_TYPE=hpfs ID_FS_USAGE=filesystem ID_FS_UUID=3BC2-32D5 diff --git a/tests/expected/blkid/low-probe-iso b/tests/expected/blkid/low-probe-iso index 31a51160..595a1acf 100644 --- a/tests/expected/blkid/low-probe-iso +++ b/tests/expected/blkid/low-probe-iso @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=IsoVolumeName ID_FS_LABEL=IsoVolumeName +ID_FS_LABEL_ENC=IsoVolumeName ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-iso-joliet b/tests/expected/blkid/low-probe-iso-joliet index 4d21557c..2810f792 100644 --- a/tests/expected/blkid/low-probe-iso-joliet +++ b/tests/expected/blkid/low-probe-iso-joliet @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=ThisWonderfulLabelIsVeryVeryLong ID_FS_LABEL=ThisWonderfulLabelIsVeryVeryLong +ID_FS_LABEL_ENC=ThisWonderfulLabelIsVeryVeryLong ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem ID_FS_VERSION=Joliet\x20Extension diff --git a/tests/expected/blkid/low-probe-iso-rr-joliet b/tests/expected/blkid/low-probe-iso-rr-joliet index 0b3acffa..f0b82c96 100644 --- a/tests/expected/blkid/low-probe-iso-rr-joliet +++ b/tests/expected/blkid/low-probe-iso-rr-joliet @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=ThisIsVolumeName ID_FS_LABEL=ThisIsVolumeName +ID_FS_LABEL_ENC=ThisIsVolumeName ID_FS_TYPE=iso9660 ID_FS_USAGE=filesystem ID_FS_VERSION=Joliet\x20Extension diff --git a/tests/expected/blkid/low-probe-jfs b/tests/expected/blkid/low-probe-jfs index 08f9c1e6..877fd168 100644 --- a/tests/expected/blkid/low-probe-jfs +++ b/tests/expected/blkid/low-probe-jfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-jfs ID_FS_LABEL=test-jfs +ID_FS_LABEL_ENC=test-jfs ID_FS_TYPE=jfs ID_FS_USAGE=filesystem ID_FS_UUID=9bf7b82e-7583-4c74-99a4-189a691f27b5 diff --git a/tests/expected/blkid/low-probe-lvm2 b/tests/expected/blkid/low-probe-lvm2 index 5c8e48f9..19aed2aa 100644 --- a/tests/expected/blkid/low-probe-lvm2 +++ b/tests/expected/blkid/low-probe-lvm2 @@ -1,5 +1,5 @@ ID_FS_TYPE=LVM2_member ID_FS_USAGE=raid -ID_FS_UUID_ENC=Vynv4k-APH8-xQER-HSBb-8VJ3-SvFF-PB5O1U ID_FS_UUID=Vynv4k-APH8-xQER-HSBb-8VJ3-SvFF-PB5O1U +ID_FS_UUID_ENC=Vynv4k-APH8-xQER-HSBb-8VJ3-SvFF-PB5O1U ID_FS_VERSION=LVM2\x20001 diff --git a/tests/expected/blkid/low-probe-ntfs b/tests/expected/blkid/low-probe-ntfs index 019e4cec..aaaa077d 100644 --- a/tests/expected/blkid/low-probe-ntfs +++ b/tests/expected/blkid/low-probe-ntfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=Новый\x20том ID_FS_LABEL=Новый_том +ID_FS_LABEL_ENC=Новый\x20том ID_FS_TYPE=ntfs ID_FS_USAGE=filesystem ID_FS_UUID=09CBB6DE30C87310 diff --git a/tests/expected/blkid/low-probe-ocfs2 b/tests/expected/blkid/low-probe-ocfs2 index 2463e2ad..2328d21a 100644 --- a/tests/expected/blkid/low-probe-ocfs2 +++ b/tests/expected/blkid/low-probe-ocfs2 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-ocfs2 ID_FS_LABEL=test-ocfs2 +ID_FS_LABEL_ENC=test-ocfs2 ID_FS_TYPE=ocfs2 ID_FS_USAGE=filesystem ID_FS_UUID=6b6bfbea-3a79-4f0c-b166-a20776102445 diff --git a/tests/expected/blkid/low-probe-reiser3 b/tests/expected/blkid/low-probe-reiser3 index 7d9e0147..d376ecae 100644 --- a/tests/expected/blkid/low-probe-reiser3 +++ b/tests/expected/blkid/low-probe-reiser3 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TESTREISER ID_FS_LABEL=TESTREISER +ID_FS_LABEL_ENC=TESTREISER ID_FS_TYPE=reiserfs ID_FS_USAGE=filesystem ID_FS_UUID=9efe7863-b124-46dc-ad68-8ecd04230a7b diff --git a/tests/expected/blkid/low-probe-reiser4 b/tests/expected/blkid/low-probe-reiser4 index f1d98b94..65d63aa6 100644 --- a/tests/expected/blkid/low-probe-reiser4 +++ b/tests/expected/blkid/low-probe-reiser4 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TESTR4 ID_FS_LABEL=TESTR4 +ID_FS_LABEL_ENC=TESTR4 ID_FS_TYPE=reiser4 ID_FS_USAGE=filesystem ID_FS_UUID=9722633c-d69a-4881-b1c8-bedecbbf39d2 diff --git a/tests/expected/blkid/low-probe-romfs b/tests/expected/blkid/low-probe-romfs index a33b6f3d..2eb982bc 100644 --- a/tests/expected/blkid/low-probe-romfs +++ b/tests/expected/blkid/low-probe-romfs @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=test-romfs ID_FS_LABEL=test-romfs +ID_FS_LABEL_ENC=test-romfs ID_FS_TYPE=romfs ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-small-fat32 b/tests/expected/blkid/low-probe-small-fat32 index 2315c4d5..39239e6b 100644 --- a/tests/expected/blkid/low-probe-small-fat32 +++ b/tests/expected/blkid/low-probe-small-fat32 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=TESTVFAT ID_FS_LABEL=TESTVFAT +ID_FS_LABEL_ENC=TESTVFAT ID_FS_TYPE=vfat ID_FS_USAGE=filesystem ID_FS_UUID=1423-AAE1 diff --git a/tests/expected/blkid/low-probe-swap1 b/tests/expected/blkid/low-probe-swap1 index 537f754d..e078d999 100644 --- a/tests/expected/blkid/low-probe-swap1 +++ b/tests/expected/blkid/low-probe-swap1 @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=SWAP-TEST ID_FS_LABEL=SWAP-TEST +ID_FS_LABEL_ENC=SWAP-TEST ID_FS_TYPE=swap ID_FS_USAGE=other ID_FS_UUID=8ff8e77f-8553-485e-8656-58be67a81666 diff --git a/tests/expected/blkid/low-probe-tuxonice b/tests/expected/blkid/low-probe-tuxonice new file mode 100644 index 00000000..3fd5a94d --- /dev/null +++ b/tests/expected/blkid/low-probe-tuxonice @@ -0,0 +1,5 @@ +ID_FS_TYPE=swsuspend +ID_FS_USAGE=other +ID_FS_UUID=7ec1e8e4-0a69-4565-860c-3f13b0f79838 +ID_FS_UUID_ENC=7ec1e8e4-0a69-4565-860c-3f13b0f79838 +ID_FS_VERSION=tuxonice diff --git a/tests/expected/blkid/low-probe-udf b/tests/expected/blkid/low-probe-udf index 392eac4f..ec249639 100644 --- a/tests/expected/blkid/low-probe-udf +++ b/tests/expected/blkid/low-probe-udf @@ -1,4 +1,4 @@ -ID_FS_LABEL_ENC=test-udf ID_FS_LABEL=test-udf +ID_FS_LABEL_ENC=test-udf ID_FS_TYPE=udf ID_FS_USAGE=filesystem diff --git a/tests/expected/blkid/low-probe-vmfs b/tests/expected/blkid/low-probe-vmfs index 1618e30c..41914b0f 100644 --- a/tests/expected/blkid/low-probe-vmfs +++ b/tests/expected/blkid/low-probe-vmfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=toto ID_FS_LABEL=toto +ID_FS_LABEL_ENC=toto ID_FS_TYPE=VMFS ID_FS_USAGE=filesystem ID_FS_UUID=49edf844-ebfc28f3-65cb-0021280083cf diff --git a/tests/expected/blkid/low-probe-xfs b/tests/expected/blkid/low-probe-xfs index 9dbaf445..f21d881a 100644 --- a/tests/expected/blkid/low-probe-xfs +++ b/tests/expected/blkid/low-probe-xfs @@ -1,5 +1,5 @@ -ID_FS_LABEL_ENC=test-xfs ID_FS_LABEL=test-xfs +ID_FS_LABEL_ENC=test-xfs ID_FS_TYPE=xfs ID_FS_USAGE=filesystem ID_FS_UUID=8c8a0a5a-9f57-492e-9610-45a61f38f58a diff --git a/tests/expected/blkid/low-probe-zfs b/tests/expected/blkid/low-probe-zfs index 94cec8b3..46727de8 100644 --- a/tests/expected/blkid/low-probe-zfs +++ b/tests/expected/blkid/low-probe-zfs @@ -1,3 +1,9 @@ -ID_FS_TYPE=zfs -ID_FS_USAGE=filesystem -ID_FS_VERSION=1 +ID_FS_LABEL=tank +ID_FS_LABEL_ENC=tank +ID_FS_TYPE=zfs_member +ID_FS_USAGE=raid +ID_FS_UUID=1782036546311300980 +ID_FS_UUID_ENC=1782036546311300980 +ID_FS_UUID_SUB=13179280127379850514 +ID_FS_UUID_SUB_ENC=13179280127379850514 +ID_FS_VERSION=8 diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part new file mode 100644 index 00000000..d770a741 --- /dev/null +++ b/tests/expected/blkid/md-raid1-part @@ -0,0 +1,66 @@ +Create partitions +Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel + +Changes will remain in memory only, until you decide to write them. +After that, of course, the previous content won't be recoverable. + +Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) + +WARNING: DOS-compatible mode is deprecated. It's strongly recommended to + switch off the mode (command 'c') and change display units to + sectors (command 'u'). + +Command (m for help): DOS Compatibility flag is not set + +Command (m for help): Changing display/entry units to sectors + +Command (m for help): Command action + e extended + p primary partition (1-4) +Partition number (1-4, default 1): First sector (2048-104447, default 2048): Using default value 2048 +Last sector, +sectors or +size{K,M,G} (2048-104447, default 104447): +Command (m for help): Command action + e extended + p primary partition (1-4) +Partition number (1-4, default 2): First sector (53248-104447, default 53248): Using default value 53248 +Last sector, +sectors or +size{K,M,G} (53248-104447, default 104447): Using default value 104447 + +Command (m for help): +Disk /dev/sdb: 53 MB, 53477376 bytes +32 heads, 32 sectors/track, 102 cylinders, total 104448 sectors +Units = sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / 32768 bytes + + + Device Boot Start End Blocks Id System +/dev/sdb1 2048 53247 25600 83 Linux +/dev/sdb2 53248 104447 25600 83 Linux + +Command (m for help): The partition table has been altered! + +Calling ioctl() to re-read partition table. +Syncing disks. +Create RAID1 device +Probe whole-disk +ID_PART_TABLE_TYPE=dos +Probe first RAID member +ID_FS_TYPE=linux_raid_member +ID_FS_USAGE=raid + + +ID_FS_VERSION=0.90.0 +ID_PART_ENTRY_NUMBER=1 +ID_PART_ENTRY_SCHEME=dos +ID_PART_ENTRY_TYPE=0x83 +ID_PART_ENTRY_TYPE_ENC=0x83 +Probe second RAID member +ID_FS_TYPE=linux_raid_member +ID_FS_USAGE=raid + + +ID_FS_VERSION=0.90.0 +ID_PART_ENTRY_NUMBER=2 +ID_PART_ENTRY_SCHEME=dos +ID_PART_ENTRY_TYPE=0x83 +ID_PART_ENTRY_TYPE_ENC=0x83 diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole new file mode 100644 index 00000000..670a6023 --- /dev/null +++ b/tests/expected/blkid/md-raid1-whole @@ -0,0 +1,58 @@ +Initialize devices +Create RAID device +Create partitions on RAID device +Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel + +Changes will remain in memory only, until you decide to write them. +After that, of course, the previous content won't be recoverable. + +Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) + +WARNING: DOS-compatible mode is deprecated. It's strongly recommended to + switch off the mode (command 'c') and change display units to + sectors (command 'u'). + +Command (m for help): DOS Compatibility flag is not set + +Command (m for help): Changing display/entry units to sectors + +Command (m for help): Command action + e extended + p primary partition (1-4) +Partition number (1-4, default 1): First sector (2048-102271, default 2048): Using default value 2048 +Last sector, +sectors or +size{K,M,G} (2048-102271, default 102271): +Command (m for help): Command action + e extended + p primary partition (1-4) +Partition number (1-4, default 2): First sector (22528-102271, default 22528): Using default value 22528 +Last sector, +sectors or +size{K,M,G} (22528-102271, default 102271): +Command (m for help): +Disk /dev/md8: 52 MB, 52363264 bytes +2 heads, 4 sectors/track, 12784 cylinders, total 102272 sectors +Units = sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / 512 bytes + + + Device Boot Start End Blocks Id System +/dev/md8p1 2048 22527 10240 83 Linux +/dev/md8p2 22528 43007 10240 83 Linux + +Command (m for help): The partition table has been altered! + +Calling ioctl() to re-read partition table. +Syncing disks. +Probe first RAID member +ID_FS_TYPE=linux_raid_member +ID_FS_USAGE=raid + + +ID_FS_VERSION=0.90.0 +Probe second RAID member +ID_FS_TYPE=linux_raid_member +ID_FS_USAGE=raid + + +ID_FS_VERSION=0.90.0 +Stop RAID device +Deinitialize devices |