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/expected/fdisk/align-512-512 | |
| 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/expected/fdisk/align-512-512')
| -rw-r--r-- | tests/expected/fdisk/align-512-512 | 14 |
1 files changed, 3 insertions, 11 deletions
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 |