diff options
| author | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
| commit | 0864d694ca05ea9383ef09bc1bc3a182e15e2ffa (patch) | |
| tree | 2e5237f1d4e2cac2efad97ce31abc386c1e37b6d /tests/ts/blkid | |
| parent | 3cbdfd84fde6159d7778e70618fbbc8df219cafe (diff) | |
| parent | 6c91f5e3e1de32c45ea0b38227ce35eb43eb2ebc (diff) | |
| download | util-linux-old-0864d694ca05ea9383ef09bc1bc3a182e15e2ffa.tar.gz | |
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
Diffstat (limited to 'tests/ts/blkid')
| -rw-r--r-- | tests/ts/blkid/images-fs/exfat.img.bz2 | bin | 0 -> 6301 bytes | |||
| -rw-r--r-- | tests/ts/blkid/images-fs/nilfs2.img.bz2 | bin | 0 -> 795 bytes | |||
| -rw-r--r-- | tests/ts/blkid/images-fs/tuxonice.img.bz2 | bin | 2765314 -> 36891 bytes | |||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-part | 2 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-whole | 2 |
5 files changed, 0 insertions, 4 deletions
diff --git a/tests/ts/blkid/images-fs/exfat.img.bz2 b/tests/ts/blkid/images-fs/exfat.img.bz2 Binary files differnew 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 Binary files differnew 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 Binary files differindex 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 |