Merge remote branch 'origin/master'

Conflicts:
	mount/Makefile.am
	sys-utils/ipcs.c
	tests/ts/blkid/images-fs/befs.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2

35 files changed, 225 insertions, 160 deletions

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index f52a6868..94f6521e 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -11,6 +11,7 @@ TS_HELPER_MD5="$TS_TOPDIR/helpers/test_md5"
 
 TS_HELPER_ISMOUNTED="$TOPDIR/lib/test_ismounted"
 TS_HELPER_STRTOSIZE="$TOPDIR/lib/test_strtosize"
+TS_HELPER_CPUSET="$TOPDIR/lib/test_cpuset"
 
 # TODO: use partx
 TS_HELPER_PARTITIONS="$TOPDIR/shlibs/blkid/samples/partitions"
diff --git a/tests/expected/blkid/low-probe-ddf-raid b/tests/expected/blkid/low-probe-ddf-raid
index 08329501..7956dcd0 100644
--- a/tests/expected/blkid/low-probe-ddf-raid
+++ b/tests/expected/blkid/low-probe-ddf-raid
@@ -1,5 +1,5 @@
 ID_FS_TYPE=ddf_raid_member
 ID_FS_USAGE=raid
-ID_FS_UUID=8Z_I__B_8Z_I_e_I_q_I____
-ID_FS_UUID_ENC=8Z\xb0I\x95\x10B\x028Z\xb0I\xc8e\xb0I\xb8q\xb0I\xff\xff\xff\xff
-ID_FS_VERSION=02.00.00
+ID_FS_UUID=Linux-MDޭ__
+ID_FS_UUID_ENC=Linux-MDޭ\xbe\xef
+ID_FS_VERSION=01.02.00
diff --git a/tests/expected/blkid/low-probe-exfat b/tests/expected/blkid/low-probe-exfat
new file mode 100644
index 00000000..b9defbdf
--- /dev/null
+++ b/tests/expected/blkid/low-probe-exfat
@@ -0,0 +1,7 @@
+ID_FS_LABEL=Новый_том
+ID_FS_LABEL_ENC=Новый\x20том
+ID_FS_TYPE=exfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=9C23-8877
+ID_FS_UUID_ENC=9C23-8877
+ID_FS_VERSION=1.0
diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2
new file mode 100644
index 00000000..c6c9cab1
--- /dev/null
+++ b/tests/expected/blkid/low-probe-nilfs2
@@ -0,0 +1,7 @@
+ID_FS_LABEL=test-nilfs2
+ID_FS_LABEL_ENC=test-nilfs2
+ID_FS_TYPE=nilfs2
+ID_FS_USAGE=filesystem
+ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806
+ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806
+ID_FS_VERSION=2
diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index d770a741..f1d4cbbb 100644
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -6,14 +6,6 @@ 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)
@@ -53,7 +45,6 @@ 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
@@ -63,4 +54,3 @@ 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
index 670a6023..32281c61 100644
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -8,14 +8,6 @@ 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)
diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 9613e176..7be7c039 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -10,28 +10,20 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-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): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-102399, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 95e3bd9b..51e75f95 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -10,28 +10,20 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-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): First sector (7-102399, default 7): Using default value 7
+Partition number (1-4, default 1): First sector (7-102399, default 7): Using default value 7
 Last sector, +sectors or +size{K,M,G} (7-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (20487-102399, default 20487): Using default value 20487
+Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487
 Last sector, +sectors or +size{K,M,G} (20487-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (40967-102399, default 40967): Using default value 40967
+Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967
 Last sector, +sectors or +size{K,M,G} (40967-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 026b94a6..db43ec6d 100644
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -10,23 +10,15 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-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): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using default value 102399
 
 Command (m for help): 
@@ -60,23 +52,15 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-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): First sector (2048-100095, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-100095, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-100095, default 100095): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-100095, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): 
 Command (m for help): 
 Disk /dev/md8: 51 MB, 51249152 bytes
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index e984d6bc..c940f806 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -6,28 +6,20 @@ 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): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-102399, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 91cd1b4f..f37b5a3b 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -6,28 +6,20 @@ 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): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-102399, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/ipcs/headers b/tests/expected/ipcs/headers
index 155d3080..298d8c93 100644
--- a/tests/expected/ipcs/headers
+++ b/tests/expected/ipcs/headers
@@ -1,7 +1,7 @@
 test: shm headers
 ------ Shared Memory Attach/Detach/Change Times --------
 shmid      owner      attached             detached             changed             
------- Shared Memory Creator/Last-op --------
+------ Shared Memory Creator/Last-op PIDs --------
 shmid      owner      cpid       lpid      
 ------ Shared Memory Segment Creators/Owners --------
 shmid      perms      cuid       cgid       uid        gid       
@@ -13,10 +13,10 @@ test: mesg headers
 msqid    owner      send                 recv                 change              
 ------ Message Queues PIDs --------
 msqid      owner      lspid      lrpid     
------- Message Queues: Creators/Owners --------
+------ Message Queues Creators/Owners --------
 msqid      perms      cuid       cgid       uid        gid       
------- Messages: Limits --------
------- Messages: Status --------
+------ Messages Limits --------
+------ Messages Status --------
 
 test: sem headers
 ------ Semaphore Operation/Change Times --------
@@ -43,7 +43,7 @@ semid    owner      last-op                    last-changed
 --
 ------ Message Queues Send/Recv/Change Times --------
 msqid    owner      send                 recv                 change              
------- Shared Memory Creator/Last-op --------
+------ Shared Memory Creator/Last-op PIDs --------
 shmid      owner      cpid       lpid      
 --
 ------ Message Queues PIDs --------
@@ -54,11 +54,11 @@ shmid      perms      cuid       cgid       uid        gid
 ------ Semaphore Arrays Creators/Owners --------
 semid      perms      cuid       cgid       uid        gid       
 --
------- Message Queues: Creators/Owners --------
+------ Message Queues Creators/Owners --------
 msqid      perms      cuid       cgid       uid        gid       
 ------ Shared Memory Limits --------
 ------ Semaphore Limits --------
------- Messages: Limits --------
+------ Messages Limits --------
 ------ Shared Memory Status --------
 ------ Semaphore Status --------
------- Messages: Status --------
+------ Messages Status --------
diff --git a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
index e38bf46d..f7a38445 100644
--- a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
+++ b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
@@ -11,16 +11,19 @@ L1d cache:             16K
 L1i cache:             16K
 L2 cache:              256K
 L3 cache:              3072K
+NUMA node0 CPU(s):     4-7
+NUMA node1 CPU(s):     0-3
+NUMA node2 CPU(s):     
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
 # starting from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,1,1,0,,1,1,1,1
-2,2,2,0,,2,2,2,2
-3,3,3,0,,3,3,3,3
-4,4,4,1,,4,4,4,4
-5,5,5,1,,5,5,5,5
-6,6,6,1,,6,6,6,6
-7,7,7,1,,7,7,7,7
+0,0,0,1,,0,0,0,0
+1,1,1,1,,1,1,1,1
+2,2,2,1,,2,2,2,2
+3,3,3,1,,3,3,3,3
+4,4,4,0,,4,4,4,4
+5,5,5,0,,5,5,5,5
+6,6,6,0,,6,6,6,6
+7,7,7,0,,7,7,7,7
diff --git a/tests/expected/lscpu/lscpu-ia64-hprx1620 b/tests/expected/lscpu/lscpu-ia64-hprx1620
index 081d8788..4812be6a 100644
--- a/tests/expected/lscpu/lscpu-ia64-hprx1620
+++ b/tests/expected/lscpu/lscpu-ia64-hprx1620
@@ -11,6 +11,7 @@ L1d cache:             16K
 L1i cache:             16K
 L2 cache:              256K
 L3 cache:              3072K
+NUMA node0 CPU(s):     0,1
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
diff --git a/tests/expected/lscpu/lscpu-ia64-pg0 b/tests/expected/lscpu/lscpu-ia64-pg0
index 7600b808..22c4539c 100644
--- a/tests/expected/lscpu/lscpu-ia64-pg0
+++ b/tests/expected/lscpu/lscpu-ia64-pg0
@@ -12,24 +12,26 @@ L1i cache:             16K
 L2d cache:             256K
 L2i cache:             1024K
 L3 cache:              6144K
+NUMA node0 CPU(s):     0-7
+NUMA node1 CPU(s):     8-15
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
 # starting from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i,L3
-0,0,0,0,,0,0,0,0,0
-1,1,0,0,,1,1,1,0,0
-2,2,1,0,,2,2,2,1,1
-3,3,1,0,,3,3,3,1,1
-4,4,2,0,,4,4,4,2,2
-5,5,2,0,,5,5,5,2,2
-6,6,3,0,,6,6,6,3,3
-7,7,3,0,,7,7,7,3,3
-8,8,4,1,,8,8,8,4,4
-9,9,4,1,,9,9,9,4,4
-10,10,5,1,,10,10,10,5,5
-11,11,5,1,,11,11,11,5,5
-12,12,6,1,,12,12,12,6,6
-13,13,6,1,,13,13,13,6,6
-14,14,7,1,,14,14,14,7,7
-15,15,7,1,,15,15,15,7,7
+0,0,0,0,,0,0,0,,
+1,1,0,0,,1,1,1,,
+2,2,1,0,,2,2,2,,
+3,3,1,0,,3,3,3,,
+4,4,2,0,,4,4,4,,
+5,5,2,0,,5,5,5,,
+6,6,3,0,,6,6,6,,
+7,7,3,0,,7,7,7,,
+8,8,4,1,,8,8,8,,
+9,9,4,1,,9,9,9,,
+10,10,5,1,,10,10,10,,
+11,11,5,1,,11,11,11,,
+12,12,6,1,,12,12,12,,
+13,13,6,1,,13,13,13,,
+14,14,7,1,,14,14,14,,
+15,15,7,1,,15,15,15,,
diff --git a/tests/expected/lscpu/lscpu-x86_64-dellr710 b/tests/expected/lscpu/lscpu-x86_64-dellr710
new file mode 100644
index 00000000..43679dc4
--- /dev/null
+++ b/tests/expected/lscpu/lscpu-x86_64-dellr710
@@ -0,0 +1,39 @@
+CPU op-mode(s):        32-bit, 64-bit
+CPU(s):                16
+Thread(s) per core:    2
+Core(s) per socket:    4
+CPU socket(s):         2
+NUMA node(s):          2
+Vendor ID:             GenuineIntel
+CPU family:            6
+Model:                 26
+Stepping:              5
+CPU MHz:               2527.073
+Virtualization:        VT-x
+L1d cache:             32K
+L1i cache:             32K
+L2 cache:              256K
+L3 cache:              8192K
+NUMA node0 CPU(s):     0,2,4,6,8,10,12,14
+NUMA node1 CPU(s):     1,3,5,7,9,11,13,15
+
+# The following is the parsable format, which can be fed to other
+# programs. Each different item in every column has an unique ID
+# starting from zero.
+# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
+0,0,0,0,,0,0,0,0
+1,1,1,1,,1,1,1,1
+2,2,0,0,,2,2,2,0
+3,3,1,1,,3,3,3,1
+4,4,0,0,,4,4,4,0
+5,5,1,1,,5,5,5,1
+6,6,0,0,,6,6,6,0
+7,7,1,1,,7,7,7,1
+8,0,0,0,,0,0,0,0
+9,1,1,1,,1,1,1,1
+10,2,0,0,,2,2,2,0
+11,3,1,1,,3,3,3,1
+12,4,0,0,,4,4,4,0
+13,5,1,1,,5,5,5,1
+14,6,0,0,,6,6,6,0
+15,7,1,1,,7,7,7,1
diff --git a/tests/expected/lscpu/lscpu-x86_64-hpdl585 b/tests/expected/lscpu/lscpu-x86_64-hpdl585
index 52bc8cb9..54a1a242 100644
--- a/tests/expected/lscpu/lscpu-x86_64-hpdl585
+++ b/tests/expected/lscpu/lscpu-x86_64-hpdl585
@@ -14,24 +14,28 @@ L1d cache:             512K
 L1i cache:             512K
 L2 cache:              512K
 L3 cache:              2048K
+NUMA node0 CPU(s):     0,4,8,12
+NUMA node1 CPU(s):     1,5,9,13
+NUMA node2 CPU(s):     2,6,10,14
+NUMA node3 CPU(s):     3,7,11,15
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
 # starting from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
-1,1,0,0,,1,1,1,1
-2,2,0,0,,2,2,2,2
-3,3,0,0,,3,3,3,3
-4,4,1,1,,4,4,4,4
+1,1,1,1,,1,1,1,1
+2,2,2,2,,2,2,2,2
+3,3,3,3,,3,3,3,3
+4,4,0,0,,4,4,4,4
 5,5,1,1,,5,5,5,5
-6,6,1,1,,6,6,6,6
-7,7,1,1,,7,7,7,7
-8,8,2,2,,8,8,8,8
-9,9,2,2,,9,9,9,9
+6,6,2,2,,6,6,6,6
+7,7,3,3,,7,7,7,7
+8,8,0,0,,8,8,8,8
+9,9,1,1,,9,9,9,9
 10,10,2,2,,10,10,10,10
-11,11,2,2,,11,11,11,11
-12,12,3,3,,12,12,12,12
-13,13,3,3,,13,13,13,13
-14,14,3,3,,14,14,14,14
+11,11,3,3,,11,11,11,11
+12,12,0,0,,12,12,12,12
+13,13,1,1,,13,13,13,13
+14,14,2,2,,14,14,14,14
 15,15,3,3,,15,15,15,15
diff --git a/tests/expected/lscpu/lscpu-x86_64-ibme326m b/tests/expected/lscpu/lscpu-x86_64-ibme326m
index a373aacc..ccc64a07 100644
--- a/tests/expected/lscpu/lscpu-x86_64-ibme326m
+++ b/tests/expected/lscpu/lscpu-x86_64-ibme326m
@@ -12,6 +12,7 @@ CPU MHz:               1995.058
 L1d cache:             1024K
 L1i cache:             1024K
 L2 cache:              1024K
+NUMA node0 CPU(s):     0,1
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
diff --git a/tests/expected/lscpu/lscpu-x86_64-necem14 b/tests/expected/lscpu/lscpu-x86_64-necem14
index 0cde9c31..c823f7e7 100644
--- a/tests/expected/lscpu/lscpu-x86_64-necem14
+++ b/tests/expected/lscpu/lscpu-x86_64-necem14
@@ -11,6 +11,7 @@ Stepping:              3
 CPU MHz:               3790.599
 L1d cache:             16K
 L2 cache:              2048K
+NUMA node0 CPU(s):     0,1
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
diff --git a/tests/expected/schedutils/cpuset b/tests/expected/schedutils/cpuset
new file mode 100644
index 00000000..10e17606
--- /dev/null
+++ b/tests/expected/schedutils/cpuset
@@ -0,0 +1,24 @@
+masks:
+0x00000001      =               1 [0]
+0x00000002      =               2 [1]
+0x00000003      =               3 [0,1]
+0x00000004      =               4 [2]
+0x00000005      =               5 [0,2]
+0x00000006      =               6 [1,2]
+0x00000007      =               7 [0-2]
+0x00000008      =               8 [3]
+0x00000009      =               9 [0,3]
+0x00005555      =            5555 [0,2,4,6,8,10,12,14]
+0x00007777      =            7777 [0-2,4-6,8-10,12-14]
+strings:
+0               =               1 [0]
+1               =               2 [1]
+0,1             =               3 [0,1]
+2               =               4 [2]
+0,2             =               5 [0,2]
+1,2             =               6 [1,2]
+0-2             =               7 [0-2]
+3               =               8 [3]
+0,3             =               9 [0,3]
+0,2,4,6,8,10,12,14 =            5555 [0,2,4,6,8,10,12,14]
+0-2,4-6,8-10,12-14 =            7777 [0-2,4-6,8-10,12-14]
diff --git a/tests/ts/blkid/images-fs/exfat.img.bz2 b/tests/ts/blkid/images-fs/exfat.img.bz2
new file mode 100644
index 00000000..f96c3f06
--- /dev/null
+++ b/tests/ts/blkid/images-fs/exfat.img.bz2
diff --git a/tests/ts/blkid/images-fs/nilfs2.img.bz2 b/tests/ts/blkid/images-fs/nilfs2.img.bz2
new file mode 100644
index 00000000..a9762eb1
--- /dev/null
+++ b/tests/ts/blkid/images-fs/nilfs2.img.bz2
diff --git a/tests/ts/blkid/images-fs/tuxonice.img.bz2 b/tests/ts/blkid/images-fs/tuxonice.img.bz2
index c47ab3e8..a70c95ad 100644
--- a/tests/ts/blkid/images-fs/tuxonice.img.bz2
+++ b/tests/ts/blkid/images-fs/tuxonice.img.bz2
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 1d55f6bb..909edd03 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -40,8 +40,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 4589dcff..0539e018 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -46,8 +46,6 @@ ts_log "Create RAID device"
 
 ts_log "Create partitions on RAID device"
 $TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index eb85c55c..99b039e2 100755
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -71,7 +71,7 @@ ts_device_has "TYPE" "cramfs" $DEVICE
 [  "$?" == "0" ] || ts_die "Cannot found cramfs on $DEVICE" $DEVICE
 
 ts_log "mount the image"
-$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
+$TS_CMD_MOUNT -r -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 
 # check it
 ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index 329d4308..956b015d 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -43,8 +43,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index 1963dd09..6ffd47eb 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -43,8 +43,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index ed0ec156..d2c5c753 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -44,8 +44,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
@@ -74,8 +72,6 @@ MD_DEVICE=/dev/${MD_DEVNAME}
 
 ts_log "Create partitions (MD)"
 $TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
index 70f0805e..f78feba5 100755
--- a/tests/ts/fdisk/align-512-512
+++ b/tests/ts/fdisk/align-512-512
@@ -31,8 +31,6 @@ DEVICE=$(ts_device_init 50)
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 63801d23..207ec178 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -43,8 +43,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/doslabel b/tests/ts/fdisk/doslabel
index 762cdaac..209a7b3e 100755
--- a/tests/ts/fdisk/doslabel
+++ b/tests/ts/fdisk/doslabel
@@ -43,57 +43,57 @@ ts_image_md5sum >> $TS_OUTPUT 2>&1
 # ID will be random and will screw up md5's
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	 | $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create primary partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Set partition type"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CHANGE_PARTTYPE}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Set primary partition active"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_SET_ACTIVE}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Re-create primary partition"
 echo -e "${FDISK_CMD_INIT}d\n${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create extended partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create logical partitions"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Delete logical partitions"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create another logical partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Delete primary partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Delete extended partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput
index 9d5c4762..ceb6102c 100755
--- a/tests/ts/fdisk/oddinput
+++ b/tests/ts/fdisk/oddinput
@@ -28,12 +28,12 @@ ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Empty image listing" # this should report empty partition table
 # TEST_IMAGE_NAME has absolute path, and is by definition different on each computer, we need to sed it away
-$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} 2>&1 | sed -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" >> $TS_OUTPUT
+$TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} 2>&1 | sed -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" >> $TS_OUTPUT
 
 ts_log "Nonexistant file" # this originally does absolutely nothing
-$TS_CMD_FDISK -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>&1
+$TS_CMD_FDISK -c=dos -u=cylinders -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>&1
 
 ts_log "Too small file" # same here
-$TS_CMD_FDISK -l $TS_TOPDIR/expected/fdisk/oddinput.toosmall >> $TS_OUTPUT 2>&1
+$TS_CMD_FDISK -c=dos -u=cylinders -l $TS_TOPDIR/expected/fdisk/oddinput.toosmall >> $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lscpu/dumps/x86_64-dellr710.tar.gz b/tests/ts/lscpu/dumps/x86_64-dellr710.tar.gz
new file mode 100644
index 00000000..2c163816
--- /dev/null
+++ b/tests/ts/lscpu/dumps/x86_64-dellr710.tar.gz
diff --git a/tests/ts/schedutils/cpuset b/tests/ts/schedutils/cpuset
new file mode 100755
index 00000000..6ad240dc
--- /dev/null
+++ b/tests/ts/schedutils/cpuset
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# This file is part of util-linux-ng.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="cpuset"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+MASKS=" 0x00000001 \
+	0x00000002 \
+	0x00000003 \
+	0x00000004 \
+	0x00000005 \
+	0x00000006 \
+	0x00000007 \
+	0x00000008 \
+	0x00000009 \
+	0x00005555 \
+	0x00007777"
+
+RANGES="0 \
+	1 \
+	0,1 \
+	2 \
+	0,2 \
+	1,2 \
+	0-2 \
+	3 \
+	0,3 \
+	0,2,4,6,8,10,12,14 \
+	0-2,4-6,8-10,12-14"
+
+ts_log "masks:"
+for i in $MASKS; do
+	$TS_HELPER_CPUSET --mask $i >> $TS_OUTPUT
+done
+
+ts_log "strings:"
+for i in $RANGES; do
+	$TS_HELPER_CPUSET --range $i >> $TS_OUTPUT
+done
+
+ts_finalize