mirror of https://github.com/vitalif/e2fsprogs
Merge branch 'maint' into next
Theodore Ts'o
commit
ae389208e9
|
|
@ -15079,7 +15079,7 @@ _ACEOF
|
|||
fi
|
||||
{ echo "$as_me:$LINENO: checking for unified diff option" >&5
|
||||
echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
|
||||
if diff -u $0 $0 >& /dev/null ; then
|
||||
if diff -u $0 $0 > /dev/null 2>&1 ; then
|
||||
UNI_DIFF_OPTS=-u
|
||||
else
|
||||
UNI_DIFF_OPTS=-c
|
||||
|
|
|
|||
|
|
@ -740,7 +740,7 @@ dnl
|
|||
dnl Check for unified diff
|
||||
dnl
|
||||
AC_MSG_CHECKING(for unified diff option)
|
||||
if diff -u $0 $0 >& /dev/null ; then
|
||||
if diff -u $0 $0 > /dev/null 2>&1 ; then
|
||||
UNI_DIFF_OPTS=-u
|
||||
else
|
||||
UNI_DIFF_OPTS=-c
|
||||
|
|
|
|||
|
|
@ -93,8 +93,9 @@ errcode_t ext2fs_create_resize_inode(ext2_filsys fs)
|
|||
if (retval)
|
||||
goto out_inode;
|
||||
} else {
|
||||
blk_t goal = 3 + sb->s_reserved_gdt_blocks +
|
||||
fs->desc_blocks + fs->inode_blocks_per_group;
|
||||
blk_t goal = sb->s_first_data_block + fs->desc_blocks +
|
||||
sb->s_reserved_gdt_blocks + 2 +
|
||||
fs->inode_blocks_per_group;
|
||||
|
||||
retval = ext2fs_alloc_block(fs, goal, 0, &dindir_blk);
|
||||
if (retval)
|
||||
|
|
|
|||
26
po/nl.po
26
po/nl.po
|
|
@ -63,10 +63,10 @@
|
|||
#.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: e2fsprogs-1.40.7\n"
|
||||
"Project-Id-Version: e2fsprogs-1.40.8\n"
|
||||
"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
|
||||
"POT-Creation-Date: 2008-02-28 21:45-0500\n"
|
||||
"PO-Revision-Date: 2008-03-08 19:45+0100\n"
|
||||
"PO-Revision-Date: 2008-04-03 22:24+0200\n"
|
||||
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
|
||||
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -895,17 +895,17 @@ msgstr "Het superblok van het ext3-journal is beschadigd.\n"
|
|||
#: e2fsck/problem.c:225
|
||||
#, c-format
|
||||
msgid "@S doesn't have has_@j flag, but has ext3 @j %s.\n"
|
||||
msgstr "Superblok heeft geen journalvlag gezet, maar heeft wel een ext3-journal %s.\n"
|
||||
msgstr "Superblok heeft geen journal-vlag gezet, maar heeft wel een ext3-journal %s.\n"
|
||||
|
||||
#. @-expanded: superblock has ext3 needs_recovery flag set, but no journal.\n
|
||||
#: e2fsck/problem.c:230
|
||||
msgid "@S has ext3 needs_recovery flag set, but no @j.\n"
|
||||
msgstr "Superblok heeft journalreddingsvlag gezet, maar heeft geen journal.\n"
|
||||
msgstr "Superblok heeft journal-reddingsvlag gezet, maar heeft geen journal.\n"
|
||||
|
||||
#. @-expanded: ext3 recovery flag is clear, but journal has data.\n
|
||||
#: e2fsck/problem.c:235
|
||||
msgid "ext3 recovery flag is clear, but @j has data.\n"
|
||||
msgstr "Journalreddingsvlag is niet gezet, maar het journal bevat gegevens.\n"
|
||||
msgstr "Journal-reddingsvlag is niet gezet, maar het journal bevat gegevens.\n"
|
||||
|
||||
#. @-expanded: Clear journal
|
||||
#: e2fsck/problem.c:240
|
||||
|
|
@ -3234,8 +3234,8 @@ msgstr ""
|
|||
"\n"
|
||||
"Blokgrootte in journal: %u\n"
|
||||
"Lengte van journal: %u\n"
|
||||
"Eerste journalblok: %u\n"
|
||||
"Kopcode van journalreeks: 0x%08x\n"
|
||||
"Eerste journal-blok: %u\n"
|
||||
"Kopcode van journal-reeks: 0x%08x\n"
|
||||
"Begin van journal: %u\n"
|
||||
"Aantal journal-gebruikers: %u\n"
|
||||
|
||||
|
|
@ -3504,7 +3504,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Gebruik: %s [-b blokgrootte] [-c|-l bestandsnaam] [-f fragmentgrootte]\n"
|
||||
" [-g blokken_per_groep] [-i bytes_per_inode] [-I inode-grootte]\n"
|
||||
" [-J journalopties] [-L label] [-M laatste_aankoppelingspunt]\n"
|
||||
" [-J journal-opties] [-L label] [-M laatste_aankoppelingspunt]\n"
|
||||
" [-m percentage_gereserveerde_blokken] [-N aantal_inodes]\n"
|
||||
" [-o naam_van_aanmakende_besturingssyteem] [-O functie[,...]]\n"
|
||||
" [-r bestandssysteemversie] [-T bestandssysteemtype] [-jnqvFSV]\n"
|
||||
|
|
@ -4134,7 +4134,7 @@ msgid ""
|
|||
"The has_journal flag may only be cleared when the filesystem is\n"
|
||||
"unmounted or mounted read-only.\n"
|
||||
msgstr ""
|
||||
"De journalvlag mag alleen gewist worden wanneer het bestandssysteem\n"
|
||||
"De journal-vlag mag alleen gewist worden wanneer het bestandssysteem\n"
|
||||
"ontkoppeld is of als alleen-lezen aangekoppeld is.\n"
|
||||
|
||||
#: misc/tune2fs.c:361
|
||||
|
|
@ -4142,8 +4142,8 @@ msgid ""
|
|||
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
|
||||
"the has_journal flag.\n"
|
||||
msgstr ""
|
||||
"De journalreddingsvlag is gezet. Voer eerst 'e2fsck' uit,\n"
|
||||
"voordat u de journalvlag wist.\n"
|
||||
"De journal-reddingsvlag is gezet. Voer eerst 'e2fsck' uit,\n"
|
||||
"voordat u de journal-vlag wist.\n"
|
||||
|
||||
#: misc/tune2fs.c:428
|
||||
msgid "The filesystem already has a journal.\n"
|
||||
|
|
@ -4466,7 +4466,7 @@ msgid ""
|
|||
"%g days, whichever comes first. Use tune2fs -c or -i to override.\n"
|
||||
msgstr ""
|
||||
"Dit bestandssysteem zal automatisch gecontroleerd worden na elke\n"
|
||||
"%d aankoppelingen of %g dagen, afhankelijk van wat het eerste voorkomt.\n"
|
||||
"%d aankoppelingen of na %g dagen, afhankelijk van wat het eerst voorkomt.\n"
|
||||
"U kunt 'tune2fs' met '-c' of '-i' gebruiken om dit bij te stellen.\n"
|
||||
|
||||
#: misc/uuidgen.c:31
|
||||
|
|
@ -4539,7 +4539,7 @@ msgstr "tijdens opvragen van status van %s"
|
|||
#: resize/main.c:339
|
||||
#, c-format
|
||||
msgid "bad filesystem size - %s"
|
||||
msgstr "onjuiste groote van bestandssysteem: %s"
|
||||
msgstr "onjuiste grootte van bestandssysteem: %s"
|
||||
|
||||
#: resize/main.c:353
|
||||
msgid "Invalid stride length"
|
||||
|
|
|
|||
6
po/vi.po
6
po/vi.po
|
|
@ -1,6 +1,6 @@
|
|||
# Vietnamese translation for e2fsprogs.
|
||||
# Copyright © 2008 Theodore Tso (msgids)
|
||||
# This file is distributed under the same license as the e2fsprogs-1.40.7 package.
|
||||
# This file is distributed under the same license as the e2fsprogs-1.40.8 package.
|
||||
# Clytie Siddall <clytie@riverland.net.au>, 2006-2008.
|
||||
#
|
||||
#. The strings in e2fsck's problem.c can be very hard to translate,
|
||||
|
|
@ -63,10 +63,10 @@
|
|||
#.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: e2fsprogs 1.40.7\n"
|
||||
"Project-Id-Version: e2fsprogs 1.40.8\n"
|
||||
"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
|
||||
"POT-Creation-Date: 2008-02-28 21:45-0500\n"
|
||||
"PO-Revision-Date: 2008-03-10 18:11+1030\n"
|
||||
"PO-Revision-Date: 2008-04-06 21:11+0930\n"
|
||||
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
|
||||
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,112 @@
|
|||
mke2fs: reserved online resize blocks not supported on non-sparse filesystem
|
||||
./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem
|
||||
features: Filesystem not open
|
||||
|
||||
../e2fsck/e2fsck: Attempt to read block from filesystem resulted in short read while trying to open ./test.img
|
||||
Could this be a zero-length partition?
|
||||
Exit status is 8
|
||||
Filesystem label=
|
||||
OS type: Linux
|
||||
Block size=1024 (log=0)
|
||||
Fragment size=1024 (log=0)
|
||||
16384 inodes, 65536 blocks
|
||||
3276 blocks (5.00%) reserved for the super user
|
||||
First data block=1
|
||||
8 block groups
|
||||
8192 blocks per group, 8192 fragments per group
|
||||
2048 inodes per group
|
||||
Superblock backups stored on blocks:
|
||||
8193, 16385, 24577, 32769, 40961, 49153, 57345
|
||||
|
||||
../misc/dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open ./test.img
|
||||
Couldn't find valid filesystem superblock.
|
||||
Writing inode tables: done
|
||||
Writing superblocks and filesystem accounting information: done
|
||||
|
||||
Filesystem features:(none)
|
||||
|
||||
Pass 1: Checking inodes, blocks, and sizes
|
||||
Pass 2: Checking directory structure
|
||||
Pass 3: Checking directory connectivity
|
||||
Pass 4: Checking reference counts
|
||||
Pass 5: Checking group summary information
|
||||
test_filesys: 11/16384 files (0.0% non-contiguous), 2094/65536 blocks
|
||||
Exit status is 0
|
||||
|
||||
Filesystem volume name: <none>
|
||||
Last mounted on: <not available>
|
||||
Filesystem magic number: 0xEF53
|
||||
Filesystem revision #: 1 (dynamic)
|
||||
Filesystem features: (none)
|
||||
Default mount options: (none)
|
||||
Filesystem state: clean
|
||||
Errors behavior: Continue
|
||||
Filesystem OS type: Linux
|
||||
Inode count: 16384
|
||||
Block count: 65536
|
||||
Reserved block count: 3276
|
||||
Free blocks: 63442
|
||||
Free inodes: 16373
|
||||
First block: 1
|
||||
Block size: 1024
|
||||
Fragment size: 1024
|
||||
Blocks per group: 8192
|
||||
Fragments per group: 8192
|
||||
Inodes per group: 2048
|
||||
Inode blocks per group: 256
|
||||
Mount count: 0
|
||||
Check interval: 15552000 (6 months)
|
||||
Reserved blocks uid: 0
|
||||
Reserved blocks gid: 0
|
||||
First inode: 11
|
||||
Inode size: 128
|
||||
Default directory hash: tea
|
||||
|
||||
|
||||
Group 0: (Blocks 1-8192)
|
||||
Primary superblock at 1, Group descriptors at 2-2
|
||||
Block bitmap at 3 (+2), Inode bitmap at 4 (+3)
|
||||
Inode table at 5-260 (+4)
|
||||
7919 free blocks, 2037 free inodes, 2 directories
|
||||
Free blocks: 274-8192
|
||||
Free inodes: 12-2048
|
||||
Group 1: (Blocks 8193-16384)
|
||||
Backup superblock at 8193, Group descriptors at 8194-8194
|
||||
Block bitmap at 8195 (+2), Inode bitmap at 8196 (+3)
|
||||
Inode table at 8197-8452 (+4)
|
||||
7932 free blocks, 2048 free inodes, 0 directories
|
||||
Free blocks: 8453-16384
|
||||
Free inodes: 2049-4096
|
||||
Group 2: (Blocks 16385-24576)
|
||||
Backup superblock at 16385, Group descriptors at 16386-16386
|
||||
Block bitmap at 16387 (+2), Inode bitmap at 16388 (+3)
|
||||
Inode table at 16389-16644 (+4)
|
||||
7932 free blocks, 2048 free inodes, 0 directories
|
||||
Free blocks: 16645-24576
|
||||
Free inodes: 4097-6144
|
||||
Group 3: (Blocks 24577-32768)
|
||||
Backup superblock at 24577, Group descriptors at 24578-24578
|
||||
Block bitmap at 24579 (+2), Inode bitmap at 24580 (+3)
|
||||
Inode table at 24581-24836 (+4)
|
||||
7932 free blocks, 2048 free inodes, 0 directories
|
||||
Free blocks: 24837-32768
|
||||
Free inodes: 6145-8192
|
||||
Group 4: (Blocks 32769-40960)
|
||||
Backup superblock at 32769, Group descriptors at 32770-32770
|
||||
Block bitmap at 32771 (+2), Inode bitmap at 32772 (+3)
|
||||
Inode table at 32773-33028 (+4)
|
||||
7932 free blocks, 2048 free inodes, 0 directories
|
||||
Free blocks: 33029-40960
|
||||
Free inodes: 8193-10240
|
||||
Group 5: (Blocks 40961-49152)
|
||||
Backup superblock at 40961, Group descriptors at 40962-40962
|
||||
Block bitmap at 40963 (+2), Inode bitmap at 40964 (+3)
|
||||
Inode table at 40965-41220 (+4)
|
||||
7932 free blocks, 2048 free inodes, 0 directories
|
||||
Free blocks: 41221-49152
|
||||
Free inodes: 10241-12288
|
||||
Group 6: (Blocks 49153-57344)
|
||||
Backup superblock at 49153, Group descriptors at 49154-49154
|
||||
Block bitmap at 49155 (+2), Inode bitmap at 49156 (+3)
|
||||
Inode table at 49157-49412 (+4)
|
||||
7932 free blocks, 2048 free inodes, 0 directories
|
||||
Free blocks: 49413-57344
|
||||
Free inodes: 12289-14336
|
||||
Group 7: (Blocks 57345-65535)
|
||||
Backup superblock at 57345, Group descriptors at 57346-57346
|
||||
Block bitmap at 57347 (+2), Inode bitmap at 57348 (+3)
|
||||
Inode table at 57349-57604 (+4)
|
||||
7931 free blocks, 2048 free inodes, 0 directories
|
||||
Free blocks: 57605-65535
|
||||
Free inodes: 14337-16384
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
DESCRIPTION="no filesystem extensions"
|
||||
FS_SIZE=65536
|
||||
MKE2FS_OPTS="-O ^sparse_super,^filetype"
|
||||
MKE2FS_OPTS="-O ^sparse_super,^filetype,^resize_inode,^dir_index,^ext_attr"
|
||||
. $cmd_dir/run_mke2fs
|
||||
|
|
|
|||
Loading…
Reference in New Issue