aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-06-16 18:54:01 -0400
committerTheodore Ts'o <tytso@mit.edu>2013-06-16 18:54:01 -0400
commit8b9eb12807786f67f8be99da43c878743b8a6917 (patch)
treea8d66b9cff1cb8a8ef4bdd33ee7ca16a61e1bb8a
parent70f4632b626e3db94dd02c9dc9b4e643ffb0d048 (diff)
parent6e2393fde2552a8c6449639a733e8ae4e095b113 (diff)
downloade2fsprogs-8b9eb12807786f67f8be99da43c878743b8a6917.tar.gz
e2fsprogs-8b9eb12807786f67f8be99da43c878743b8a6917.tar.xz
e2fsprogs-8b9eb12807786f67f8be99da43c878743b8a6917.zip
Merge branch 'maint' into next
Conflicts: RELEASE-NOTES e2fsck/Makefile.in lib/config.h.in version.h
-rw-r--r--README2
-rw-r--r--RELEASE-NOTES76
-rwxr-xr-xconfigure24
-rw-r--r--configure.in17
-rw-r--r--debian/changelog33
-rw-r--r--debian/control.in2
-rwxr-xr-xdebian/rules4
-rwxr-xr-xdebian/scripts/test-backtrace34
-rw-r--r--doc/libext2fs.texinfo8
-rw-r--r--e2fsck/Makefile.in3
-rw-r--r--e2fsck/sigcatcher.c2
-rw-r--r--e2fsprogs.lsm10
-rw-r--r--lib/blkid/cache.c7
-rw-r--r--lib/config.h.in6
-rw-r--r--lib/et/error_message.c7
-rw-r--r--lib/ext2fs/closefs.c19
-rw-r--r--lib/ext2fs/ext2fs.h2
-rw-r--r--lib/ext2fs/sparse.c79
-rw-r--r--lib/ext2fs/test_io.c10
-rw-r--r--lib/ss/pager.c7
-rw-r--r--misc/e2image.c2
-rw-r--r--misc/mke2fs.8.in15
-rw-r--r--misc/mke2fs.c126
-rw-r--r--misc/mke2fs.conf.5.in2
-rw-r--r--po/e2fsprogs.pot792
-rw-r--r--tests/d_loaddump/script6
-rw-r--r--tests/d_special_files/script14
-rw-r--r--tests/f_jnl_32bit/expect.01
-rw-r--r--tests/f_jnl_32bit/script2
-rw-r--r--tests/f_jnl_64bit/expect.01
-rw-r--r--tests/f_jnl_64bit/script2
-rw-r--r--tests/f_jnl_errno/expect.01
-rw-r--r--tests/f_jnl_errno/script2
-rw-r--r--tests/f_orphan_indirect_inode/expect.11
-rw-r--r--tests/f_preen/expect.11
-rw-r--r--tests/f_resize_inode/script36
-rw-r--r--tests/filter.sed (renamed from tests/filter_dumpe2fs)15
-rw-r--r--tests/m_bigjournal/expect.12
-rw-r--r--tests/m_dasd_bs/expect.12
-rw-r--r--tests/m_extent_journal/expect.12
-rw-r--r--tests/m_large_file/expect.12
-rw-r--r--tests/m_meta_bg/expect.12
-rw-r--r--tests/m_mkfs_overhead/script4
-rw-r--r--tests/m_mmp/expect.12
-rw-r--r--tests/m_no_opt/expect.12
-rw-r--r--tests/m_raid_opt/expect.12
-rw-r--r--tests/m_raid_opt/script2
-rw-r--r--tests/m_root_owner/expect.165
-rw-r--r--tests/m_root_owner/script4
-rw-r--r--tests/m_std/expect.12
-rw-r--r--tests/m_uninit/expect.12
-rw-r--r--tests/r_inline_xattr/script2
-rw-r--r--tests/r_move_itable/expect4
-rw-r--r--tests/r_move_itable/script37
-rw-r--r--tests/r_resize_inode/expect3
-rw-r--r--tests/r_resize_inode/script34
-rw-r--r--tests/run_e2fsck6
-rw-r--r--tests/run_mke2fs7
-rw-r--r--version.h3
59 files changed, 901 insertions, 661 deletions
diff --git a/README b/README
index 0e74ad02..b29baf8b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
- This is the new version (1.42.7) of the second extended file
+ This is the new version (1.42.8) of the second extended file
system management programs.
From time to time, I release new versions of e2fsprogs, to fix
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 20470d7f..6d662542 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,4 +1,4 @@
-E2fsprogs 1.43-WIP (September 22, 2012)
+E2fsprogs 1.43-WIP (June 16, 2012)
=======================================
Add support for the ext4 metadata checksum feature.
@@ -18,6 +18,80 @@ needed by boot loadsers such as yaboot.
Support for the MMP feature can now be disabled at compile time.
+E2fsprogs 1.42.8 (June 16, 2013)
+================================
+
+As a part of mke2fs's option parsing cleanup, the use of the -R option
+will give a warning that it is depreated (it has been so documented
+since 2005) and -E should be used instead.
+
+Mke2fs will not give warnings about the bigalloc and quota options in
+quiet mode.
+
+Debugfs was erroneously giving spurious error messages for certain
+extent_inode subcommands which take arguments (split_node,
+replace_node, and insert_node). This has been fixed.
+
+Fix the parsing of the 's' (sectors) in parse_num_blocks2, which among
+other programs is used by mke2fs.
+
+Change mke2fs so that it does not set the root directory to the real
+uid/gid of the mke2fs process. Add the extended option root_owner to
+override this behavior.
+
+E2fsck will now detect and repair corrupted extent trees which contain
+invalid extents at the end of the extent tree leaf block.
+
+E2fsck will now longer complain about zero length extended attribute
+values.
+
+Fix a regression introduced in e2fsprogs v1.42 which caused e2image -s
+to crash.
+
+Add safety check so tune2fs will not attempt to set the inode size to
+be larger than the block size.
+
+Fix e2fsck so it can check a read-only root file system with an
+external journal. (Addresses Debian Bug: #707030
+
+Fix off-line resizing of file systems with flex_bg && !resize_inode
+(Addresses Debian Bug: #696746)
+
+Fix e2image with large (> 32-bit) file systems (Addresses Debian Bug:
+#703067)
+
+Enhance chattr to allow clearing the extent flag if the kernel allows
+migrating extent based files to use indirect blocks.
+
+Update German translation.
+
+Updated/fixed various man pages. (Addresses Debian Bugs: #712429,
+#712430, #707609)
+
+Fixed various Debian Packaging Issues (Addresses Debian Bug #708307)
+
+Programmer's Notes
+------------------
+
+Use secure_getenv() in preference to __secure_getenv().
+
+Optimize CPU utilization of ext2fs_bg_has_super().
+
+Fix ext2fs_llseek() on 32-bit i386 systems to work correctly when
+SEEK_CUR is used with large files.
+
+The ext2fs_read_inode_full() function will no longer use
+fs->read_inode() if the caller has requested more than the base 128
+byte inode structure and the inode size is greater than 128 bytes.
+
+Fix build failure with --enable-jbd-debug.
+
+Clean up filtering of outputs for the regression tests by using a
+common sed script.
+
+Fix gcc -Wall and clang nits.
+
+
E2fsprogs 1.42.7 (January 21, 2013)
===================================
diff --git a/configure b/configure
index ed0103f6..757c08e2 100755
--- a/configure
+++ b/configure
@@ -842,6 +842,7 @@ enable_testio_debug
enable_libuuid
enable_libblkid
enable_quota
+enable_backtrace
enable_debugfs
enable_imager
enable_resizer
@@ -1500,6 +1501,7 @@ Optional Features:
--disable-libuuid do not build private uuid library
--disable-libblkid do not build private blkid library
--enable-quota enable quota support
+ --disable-backtrace disable use backtrace
--disable-debugfs disable support of debugfs program
--disable-imager disable support of e2image program
--disable-resizer disable support of e2resize program
@@ -5338,6 +5340,26 @@ DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
+
+# Check whether --enable-backtrace was given.
+if test "${enable_backtrace+set}" = set; then :
+ enableval=$enable_backtrace; if test "$enableval" = "no"
+then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling use of backtrace" >&5
+$as_echo "Disabling use of backtrace" >&6; }
+ $as_echo "#define DISABLE_BACKTRACE 1" >>confdefs.h
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling use of backtrace" >&5
+$as_echo "Enabling use of backtrace" >&6; }
+fi
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling use of backtrace by default" >&5
+$as_echo "Enabling use of backtrace by default" >&6; }
+
+fi
+
# Check whether --enable-debugfs was given.
if test "${enable_debugfs+set}" = set; then :
enableval=$enable_debugfs; if test "$enableval" = "no"
@@ -11087,7 +11109,7 @@ if test "$ac_res" != no; then :
fi
fi
-for ac_func in __secure_getenv backtrace blkid_probe_get_topology chflags fallocate fallocate64 fchown fdatasync fstat64 ftruncate64 getdtablesize getmntinfo getpwuid_r getrlimit getrusage jrand48 llseek lseek64 mallinfo mbstowcs memalign mmap msync nanosleep open64 pathconf posix_fadvise posix_memalign prctl setmntent setresgid setresuid srandom strcasecmp strdup strnlen strptime strtoull sync_file_range sysconf usleep utime valloc
+for ac_func in __secure_getenv backtrace blkid_probe_get_topology chflags fallocate fallocate64 fchown fdatasync fstat64 ftruncate64 getdtablesize getmntinfo getpwuid_r getrlimit getrusage jrand48 llseek lseek64 mallinfo mbstowcs memalign mmap msync nanosleep open64 pathconf posix_fadvise posix_memalign prctl secure_getenv setmntent setresgid setresuid srandom strcasecmp strdup strnlen strptime strtoull sync_file_range sysconf usleep utime valloc
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/configure.in b/configure.in
index 181faeb3..8963d176 100644
--- a/configure.in
+++ b/configure.in
@@ -596,6 +596,22 @@ AC_SUBST(PROFILED_LIBQUOTA)
AC_SUBST(DEPPROFILED_LIBQUOTA)
AC_SUBST(QUOTA_CMT)
dnl
+dnl handle --disable-backtrace
+dnl
+AH_TEMPLATE([DISABLE_BACKTRACE], [Define to 1 to disable use of backtrace])
+AC_ARG_ENABLE([backtrace],
+[ --disable-backtrace disable use backtrace],
+if test "$enableval" = "no"
+then
+ AC_MSG_RESULT([Disabling use of backtrace])
+ AC_DEFINE(DISABLE_BACKTRACE, 1)
+else
+ AC_MSG_RESULT([Enabling use of backtrace])
+fi
+,
+AC_MSG_RESULT([Enabling use of backtrace by default])
+)
+dnl
dnl handle --enable-debugfs
dnl
AC_ARG_ENABLE([debugfs],
@@ -1079,6 +1095,7 @@ AC_CHECK_FUNCS(m4_flatten([
posix_fadvise
posix_memalign
prctl
+ secure_getenv
setmntent
setresgid
setresuid
diff --git a/debian/changelog b/debian/changelog
index bb075d5b..ebddd939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+e2fsprogs (1.42.8-1) unstable; urgency=low
+
+ * New upstream version
+ * Work around Debian Bug #712530 (Closes: #708307)
+ * Fix e2fsck so it can check a read-only root file system with an
+ external journal. (Closes: #707030)
+ * Fix off-line resizing of file systems with flex_bg && !resize_inode
+ (Closes: #696746)
+ * Change mke2fs so that it does not set the root directory to the real
+ uid/gid of the mke2fs process. Add the extended option root_owner to
+ override this behavior.
+ * E2fsck will now detect and repair corrupted extent trees which contain
+ invalid extents at the end of the extent tree leaf block.
+ * E2fsck will now longer complain about zero length extended attribute values.
+ * Fix a regression introduced in e2fsprogs v1.42 which caused e2image -s
+ to crash.
+ * Add safety check so tune2fs will not attempt to set the inode size to
+ be larger than the block size.
+ * Enhance chattr to allow clearing the extent flag if the kernel allows it
+ * Fix e2image with large (> 32-bit) file systems (Closes: #703067)
+ * Mke2fs will not give warnings about the bigalloc and quota options in
+ quiet mode.
+ * Debugfs was erroneously giving spurious error messages for certain
+ extent_inode subcommands which take arguments (split_node,
+ replace_node, and insert_node). This has been fixed.
+ * Fix the parsing of the 's' (sectors) in parse_num_blocks2, which among
+ other programs is used by mke2fs.
+ * Fix texinfo incompatibilities (Closes: #712365)
+ * Updated/fixed various man pages (Closes: #712429, #712430, #707609)
+ * Update German translation
+
+ -- Theodore Y. Ts'o <tytso@mit.edu> Sun, 16 Jun 2013 18:08:15 -0500
+
e2fsprogs (1.42.7-1) unstable; urgency=low
* New upstream version
diff --git a/debian/control.in b/debian/control.in
index f2e496d8..0083b9db 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,7 @@ Section: admin
Priority: required
Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
Build-Depends: texi2html (>= 1.76), gettext, texinfo, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://e2fsprogs.sourceforge.net
ifdef(`E2FSCK_STATIC',``
diff --git a/debian/rules b/debian/rules
index 4e5c682d..b1d511ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -171,7 +171,9 @@ else
USRLIB ?= /usr/lib
endif
-STD_CONF_FLAGS ?= --enable-symlink-install $(MULTIARCH_CONF)
+BACKTRACE_CONF_FLAGS ?= $(shell if ${debdir}/scripts/test-backtrace ; then echo --disable-backtrace ; fi)
+
+STD_CONF_FLAGS ?= --enable-symlink-install $(MULTIARCH_CONF) $(BACKTRACE_CONF_FLAGS)
BF_CONF_FLAGS ?= --disable-nls --disable-imager --disable-testio-debug \
--disable-uuidd --disable-tls --disable-debugfs
diff --git a/debian/scripts/test-backtrace b/debian/scripts/test-backtrace
new file mode 100755
index 00000000..d90486a0
--- /dev/null
+++ b/debian/scripts/test-backtrace
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Test to see if backtrace requires a library in /usr/lib
+# Returns true if the backtrace command works and requires a library in /usr/lib
+# This is a nasty workaround for Debian bug #708307, which is really a glibc bug
+#
+
+cat > /tmp/backtrace$$.c << EOF
+
+#include <execinfo.h>
+
+int main(int argc, char **argv)
+{
+ void *stack_syms[32];
+ int frames;
+
+ frames = backtrace(stack_syms, 32);
+ backtrace_symbols_fd(stack_syms, frames, 0);
+}
+EOF
+
+if ! cc -o /tmp/backtrace$$ /tmp/backtrace$$.c; then
+ exit 1
+fi
+
+if ! ldd /tmp/backtrace$$ > /tmp/backtrace$$.ldd 2>&1 ; then
+ exit 1
+fi
+
+grep -q /usr/lib /tmp/backtrace$$.ldd
+ret=$?
+
+/bin/rm -f /tmp/backtrace$$*
+exit $ret
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 74f0b705..768b1ded 100644
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename libext2fs.info
-@settitle The EXT2FS Library (version 1.42.7)
+@settitle The EXT2FS Library (version 1.42.8)
@synindex tp fn
@comment %**end of header
@@ -60,8 +60,8 @@ by the author.
@title The EXT2FS Library
@subtitle The EXT2FS Library
-@subtitle Version 1.42.7
-@subtitle January 2013
+@subtitle Version 1.42.8
+@subtitle June 2013
@author by Theodore Ts'o
@@ -102,7 +102,7 @@ by the Foundation.
@top The EXT2FS Library
-This manual documents the EXT2FS Library, version 1.42.7.
+This manual documents the EXT2FS Library, version 1.42.8.
@menu
* Introduction to the EXT2FS Library::
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 9395bf4f..9c27571a 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -132,7 +132,8 @@ e2fsck.profiled: $(OBJS) $(PROFILED_DEPLIBS)
$(Q) $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
$(PROFILED_LIBS)
-tst_sigcatcher: $(srcdir)/sigcatcher.c
+tst_sigcatcher: $(srcdir)/sigcatcher.c sigcatcher.o
+ $(E) " CC $@"
$(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) $(RDYNAMIC) \
$(srcdir)/sigcatcher.c -DDEBUG -o tst_sigcatcher
diff --git a/e2fsck/sigcatcher.c b/e2fsck/sigcatcher.c
index 27740bf6..421cd3e1 100644
--- a/e2fsck/sigcatcher.c
+++ b/e2fsck/sigcatcher.c
@@ -373,7 +373,7 @@ static void die_signal_handler(int signum, siginfo_t *siginfo,
fprintf(stderr, "fault addr=%p", siginfo->si_addr);
fprintf(stderr, "\n");
-#ifdef HAVE_BACKTRACE
+#if defined(HAVE_BACKTRACE) && !defined(DISABLE_BACKTRACE)
frames = backtrace(stack_syms, 32);
backtrace_symbols_fd(stack_syms, frames, 2);
#endif
diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index 3d006dbe..55b38282 100644
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,16 +1,16 @@
Begin3
Title: EXT2 Filesystem utilities
-Version: 1.42.7
-Entered-date: 21Jan2013
+Version: 1.42.8
+Entered-date: 16Jun2013
Description: The filesystem utilities for the EXT2, EXT3, and EXT4
filesystems, including e2fsck, mke2fs, dumpe2fs, and others.
Keywords: utilities, filesystem, Ext2fs, ext3, ext4
Author: tytso@mit.edu (Theodore Tso)
Maintained-by: tytso@mit.edu (Theodore Tso)
Primary-site: download.sourceforge.net /pub/sourceforge/e2fsprogs
- 5844kB e2fsprogs-1.42.7.tar.gz
- 560kB e2fsprogs-libs-1.42.7.tar.gz
- 1kB e2fsprogs-1.42.7.lsm
+ 5852kB e2fsprogs-1.42.8.tar.gz
+ 564kB e2fsprogs-libs-1.42.8.tar.gz
+ 1kB e2fsprogs-1.42.8.lsm
Alternate-site:
Platforms: linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x
Copying-policy: GPL-2/LGPL-2
diff --git a/lib/blkid/cache.c b/lib/blkid/cache.c
index 73900a51..8bdd2399 100644
--- a/lib/blkid/cache.c
+++ b/lib/blkid/cache.c
@@ -11,6 +11,9 @@
*/
#include "config.h"
+#if HAVE_SECURE_GETENV
+#define _GNU_SOURCE
+#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -49,7 +52,9 @@ static char *safe_getenv(const char *arg)
#endif
#endif
-#ifdef HAVE___SECURE_GETENV
+#if defined(HAVE_SECURE_GETENV)
+ return secure_getenv(arg);
+#elif defined(HAVE___SECURE_GETENV)
return __secure_getenv(arg);
#else
return getenv(arg);
diff --git a/lib/config.h.in b/lib/config.h.in
index eebb75d0..fc65dde2 100644
--- a/lib/config.h.in
+++ b/lib/config.h.in
@@ -29,6 +29,9 @@
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
+/* Define to 1 to disable use of backtrace */
+#undef DISABLE_BACKTRACE
+
/* Define to 1 to enable bitmap stats. */
#undef ENABLE_BMAP_STATS
@@ -305,6 +308,9 @@
/* Define to 1 if if struct sockaddr contains sa_len */
#undef HAVE_SA_LEN
+/* Define to 1 if you have the `secure_getenv' function. */
+#undef HAVE_SECURE_GETENV
+
/* Define to 1 if you have the <semaphore.h> header file. */
#undef HAVE_SEMAPHORE_H
diff --git a/lib/et/error_message.c b/lib/et/error_message.c
index dc77b69f..92509e63 100644
--- a/lib/et/error_message.c
+++ b/lib/et/error_message.c
@@ -17,6 +17,9 @@
*/
#include "config.h"
+#if HAVE_SECURE_GETENV
+#define _GNU_SOURCE
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -209,7 +212,9 @@ static char *safe_getenv(const char *arg)
#endif
#endif
-#ifdef HAVE___SECURE_GETENV
+#if defined(HAVE_SECURE_GETENV)
+ return secure_getenv(arg);
+#elif defined(HAVE___SECURE_GETENV)
return __secure_getenv(arg);
#else
return getenv(arg);
diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index 22cecb61..157cbbeb 100644
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -20,12 +20,12 @@
#include "ext2_fs.h"
#include "ext2fsP.h"
-static int test_root(int a, int b)
+static int test_root(unsigned int a, unsigned int b)
{
- if (a == 0)
- return 1;
while (1) {
- if (a == 1)
+ if (a < b)
+ return 0;
+ if (a == b)
return 1;
if (a % b)
return 0;
@@ -33,14 +33,15 @@ static int test_root(int a, int b)
}
}
-int ext2fs_bg_has_super(ext2_filsys fs, int group_block)
+int ext2fs_bg_has_super(ext2_filsys fs, dgrp_t group)
{
if (!(fs->super->s_feature_ro_compat &
- EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER))
+ EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) || group <= 1)
return 1;
-
- if (test_root(group_block, 3) || (test_root(group_block, 5)) ||
- test_root(group_block, 7))
+ if (!(group & 1))
+ return 0;
+ if (test_root(group, 3) || (test_root(group, 5)) ||
+ test_root(group, 7))
return 1;
return 0;
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 48bc8bb7..311ceda7 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -929,7 +929,7 @@ extern errcode_t ext2fs_close(ext2_filsys fs);
extern errcode_t ext2fs_close2(ext2_filsys fs, int flags);
extern errcode_t ext2fs_flush(ext2_filsys fs);
extern errcode_t ext2fs_flush2(ext2_filsys fs, int flags);
-extern int ext2fs_bg_has_super(ext2_filsys fs, int group_block);
+extern int ext2fs_bg_has_super(ext2_filsys fs, dgrp_t group_block);
extern errcode_t ext2fs_super_and_bgd_loc2(ext2_filsys fs,
dgrp_t group,
blk64_t *ret_super_blk,
diff --git a/lib/ext2fs/sparse.c b/lib/ext2fs/sparse.c
deleted file mode 100644
index 3a0877b8..00000000
--- a/lib/ext2fs/sparse.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * sparse.c --- find the groups in an ext2 filesystem with metadata backups
- *
- * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
- * Copyright (C) 2002 Andreas Dilger.
- *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Library
- * General Public License, version 2.
- * %End-Header%
- */
-
-#include "config.h"
-#include <stdio.h>
-
-#include "ext2_fs.h"
-#include "ext2fsP.h"
-
-static int test_root(int a, int b)
-{
- if (a == 0)
- return 1;
- while (1) {
- if (a == 1)
- return 1;
- if (a % b)
- return 0;
- a = a / b;
- }
-}
-
-int ext2fs_bg_has_super(ext2_filsys fs, int group_block)
-{
- if (!(fs->super->s_feature_ro_compat &
- EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER))
- return 1;
-
- if (test_root(group_block, 3) || (test_root(group_block, 5)) ||
- test_root(group_block, 7))
- return 1;
-
- return 0;
-}
-
-/*
- * Iterate through the groups which hold BACKUP superblock/GDT copies in an
- * ext3 filesystem. The counters should be initialized to 1, 5, and 7 before
- * calling this for the first time. In a sparse filesystem it will be the
- * sequence of powers of 3, 5, and 7: 1, 3, 5, 7, 9, 25, 27, 49, 81, ...
- * For a non-sparse filesystem it will be every group: 1, 2, 3, 4, ...
- */
-unsigned int ext2fs_list_backups(ext2_filsys fs, unsigned int *three,
- unsigned int *five, unsigned int *seven)
-{
- unsigned int *min = three;
- int mult = 3;
- unsigned int ret;
-
- if (!(fs->super->s_feature_ro_compat &
- EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
- ret = *min;
- *min += 1;
- return ret;
- }
-
- if (*five < *min) {
- min = five;
- mult = 5;
- }
- if (*seven < *min) {
- min = seven;
- mult = 7;
- }
-
- ret = *min;
- *min *= mult;
-
- return ret;
-}
diff --git a/lib/ext2fs/test_io.c b/lib/ext2fs/test_io.c
index 7d3cdfed..cac67219 100644
--- a/lib/ext2fs/test_io.c
+++ b/lib/ext2fs/test_io.c
@@ -10,6 +10,12 @@
*/
#include "config.h"
+#if HAVE_SECURE_GETENV
+#define _GNU_SOURCE
+#endif
+#if HAVE_SECURE_GETENV
+#define _GNU_SOURCE
+#endif
#include <stdio.h>
#include <string.h>
#if HAVE_UNISTD_H
@@ -173,7 +179,9 @@ static char *safe_getenv(const char *arg)
#endif
#endif
-#ifdef HAVE___SECURE_GETENV
+#if defined(HAVE_SECURE_GETENV)
+ return secure_getenv(arg);
+#elif defined(HAVE___SECURE_GETENV)
return __secure_getenv(arg);
#else
return getenv(arg);
diff --git a/lib/ss/pager.c b/lib/ss/pager.c
index 2b3a4665..8b54dd1a 100644
--- a/lib/ss/pager.c
+++ b/lib/ss/pager.c
@@ -15,6 +15,9 @@
*/
#include "config.h"
+#if HAVE_SECURE_GETENV
+#define _GNU_SOURCE
+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -56,7 +59,9 @@ char *ss_safe_getenv(const char *arg)
#endif
#endif
-#ifdef HAVE___SECURE_GETENV
+#if defined(HAVE_SECURE_GETENV)
+ return secure_getenv(arg);
+#elif defined(HAVE___SECURE_GETENV)
return __secure_getenv(arg);
#else
return getenv(arg);
diff --git a/misc/e2image.c b/misc/e2image.c
index 369c9468..885a7943 100644
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -1171,7 +1171,7 @@ static void install_image(char *device, char *image_fn, int type)
{
errcode_t retval;
ext2_filsys fs;
- int open_flag = EXT2_FLAG_IMAGE_FILE;
+ int open_flag = EXT2_FLAG_IMAGE_FILE | EXT2_FLAG_64BITS;
int fd = 0;
io_manager io_ptr;
io_channel io;
diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index 023ba49b..fe2dcdbd 100644
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -268,6 +268,15 @@ small risk if the system crashes before the journal has been overwritten
entirely one time. If the option value is omitted, it defaults to 1 to
enable lazy journal inode zeroing.
.TP
+.BI root_owner [=uid:gid]
+Specify the numeric user and group ID of the root directory. If no UID:GID
+is specified, use the user and group ID of the user running \fBmke2fs\fR.
+In \fBmke2fs\fR 1.42 and earlier the UID and GID of the root directory were
+set by default to the UID and GID of the user running the mke2fs command.
+The \fBroot_owner=\fR option allows explicitly specifying these values,
+and avoid side-effects for users that do not expect the contents of the
+filesystem to change based on the user running \fBmke2fs\fR.
+.TP
.B test_fs
Set a flag in the filesystem superblock indicating that it may be
mounted using experimental kernel code, such as the ext4dev filesystem.
@@ -649,12 +658,12 @@ If this option is not specified,
will pick a default either via how
the command was run (for example, using a name of the form mkfs.ext2,
mkfs.ext3, etc.) or via a default as defined by the
-.BR /etc/mke2fs.conf (5)
+.B /etc/mke2fs.conf
file. This option controls which filesystem options are used by
default, based on the
.B fstypes
configuration stanza in
-.BR /etc/mke2fs.conf (5).
+.BR /etc/mke2fs.conf .
.sp
If the
.B \-O
@@ -673,7 +682,7 @@ Specify how the filesystem is going to be used, so that
.B mke2fs
can choose optimal filesystem parameters for that use. The usage
types that are supported are defined in the configuration file
-.BR /etc/mke2fs.conf (5).
+.BR /etc/mke2fs.conf .
The user may specify one or more usage types
using a comma separated list.
.sp
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index a59d24cc..2ffbbe9a 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -88,6 +88,8 @@ int discard = 1; /* attempt to discard device before fs creation */
int direct_io;
int force;
int noaction;
+uid_t root_uid;
+gid_t root_gid;
int journal_size;
int journal_flags;
int lazy_itable_init;
@@ -391,21 +393,19 @@ static void create_root_dir(ext2_filsys fs)
com_err("ext2fs_mkdir", retval, _("while creating root dir"));
exit(1);
}
- if (geteuid()) {
+ if (root_uid != 0 || root_gid != 0) {
retval = ext2fs_read_inode(fs, EXT2_ROOT_INO, &inode);
if (retval) {
com_err("ext2fs_read_inode", retval,
_("while reading root inode"));
exit(1);
}
- uid = getuid();
- inode.i_uid = uid;
- ext2fs_set_i_uid_high(inode, uid >> 16);
- if (uid) {
- gid = getgid();
- inode.i_gid = gid;
- ext2fs_set_i_gid_high(inode, gid >> 16);
- }
+
+ inode.i_uid = root_uid;
+ ext2fs_set_i_uid_high(inode, root_uid >> 16);
+ inode.i_gid = root_gid;
+ ext2fs_set_i_gid_high(inode, root_gid >> 16);
+
retval = ext2fs_write_new_inode(fs, EXT2_ROOT_INO, &inode);
if (retval) {
com_err("ext2fs_write_inode", retval,
@@ -612,6 +612,8 @@ static void show_stats(ext2_filsys fs)
ext2fs_r_blocks_count(s),
100.0 * ext2fs_r_blocks_count(s) / ext2fs_blocks_count(s));
printf(_("First data block=%u\n"), s->s_first_data_block);
+ if (root_uid != 0 || root_gid != 0)
+ printf(_("Root directory owner=%u:%u\n"), root_uid, root_gid);
if (s->s_reserved_gdt_blocks)
printf(_("Maximum filesystem blocks=%lu\n"),
(s->s_reserved_gdt_blocks + fs->desc_blocks) *
@@ -835,6 +837,29 @@ static void parse_extended_opts(struct ext2_super_block *param,
EXT2_MKJOURNAL_LAZYINIT : 0;
else
journal_flags |= EXT2_MKJOURNAL_LAZYINIT;
+ } else if (!strcmp(token, "root_owner")) {
+ if (arg) {
+ root_uid = strtoul(arg, &p, 0);
+ if (*p != ':') {
+ fprintf(stderr,
+ _("Invalid root_owner: '%s'\n"),
+ arg);
+ r_usage++;
+ continue;
+ }
+ p++;
+ root_gid = strtoul(p, &p, 0);
+ if (*p) {
+ fprintf(stderr,
+ _("Invalid root_owner: '%s'\n"),
+ arg);
+ r_usage++;
+ continue;
+ }
+ } else {
+ root_uid = getuid();
+ root_gid = getgid();
+ }
} else if (!strcmp(token, "discard")) {
discard = 1;
} else if (!strcmp(token, "nodiscard")) {
@@ -872,6 +897,8 @@ static void parse_extended_opts(struct ext2_super_block *param,
"\tresize=<resize maximum size in blocks>\n"
"\tlazy_itable_init=<0 to disable, 1 to enable>\n"
"\tlazy_journal_init=<0 to disable, 1 to enable>\n"
+ "\troot_uid=<uid of root directory>\n"
+ "\troot_gid=<gid of root directory>\n"
"\ttest_fs\n"
"\tdiscard\n"
"\tnodiscard\n"
@@ -1395,6 +1422,16 @@ profile_error:
case 'D':
direct_io = 1;
break;
+ case 'R':
+ com_err(program_name, 0,
+ _("'-R' is deprecated, use '-E' instead"));
+ /* fallthrough */
+ case 'E':
+ extended_opts = optarg;
+ break;
+ case 'F':
+ force++;
+ break;
case 'g':
fs_param.s_blocks_per_group = strtoul(optarg, &tmp, 0);
if (*tmp) {
@@ -1434,6 +1471,18 @@ profile_error:
exit(1);
}
break;
+ case 'I':
+ inode_size = strtoul(optarg, &tmp, 0);
+ if (*tmp) {
+ com_err(program_name, 0,
+ _("invalid inode size - %s"), optarg);
+ exit(1);
+ }
+ break;
+ case 'j':
+ if (!journal_size)
+ journal_size = -1;
+ break;
case 'J':
parse_journal_opts(optarg);
break;
@@ -1444,10 +1493,6 @@ profile_error:
"instead!\n"));
discard = 0;
break;
- case 'j':
- if (!journal_size)
- journal_size = -1;
- break;
case 'l':
bad_blocks_filename = malloc(strlen(optarg)+1);
if (!bad_blocks_filename) {
@@ -1457,6 +1502,9 @@ profile_error:
}
strcpy(bad_blocks_filename, optarg);
break;
+ case 'L':
+ volume_label = optarg;
+ break;
case 'm':
reserved_ratio = strtod(optarg, &tmp);
if ( *tmp || reserved_ratio > 50 ||
@@ -1467,12 +1515,26 @@ profile_error:
exit(1);
}
break;
+ case 'M':
+ mount_dir = optarg;
+ break;
case 'n':
noaction++;
break;
+ case 'N':
+ num_inodes = strtoul(optarg, &tmp, 0);
+ if (*tmp) {
+ com_err(program_name, 0,
+ _("bad num inodes - %s"), optarg);
+ exit(1);
+ }
+ break;
case 'o':
creator_os = optarg;
break;
+ case 'O':
+ fs_features = optarg;
+ break;
case 'q':
quiet = 1;
break;
@@ -1488,41 +1550,6 @@ profile_error:
case 's': /* deprecated */
s_opt = atoi(optarg);
break;
- case 'I':
- inode_size = strtoul(optarg, &tmp, 0);
- if (*tmp) {
- com_err(program_name, 0,
- _("invalid inode size - %s"), optarg);
- exit(1);
- }
- break;
- case 'v':
- verbose = 1;
- break;
- case 'F':
- force++;
- break;
- case 'L':
- volume_label = optarg;
- break;
- case 'M':
- mount_dir = optarg;
- break;
- case 'N':
- num_inodes = strtoul(optarg, &tmp, 0);
- if (*tmp) {
- com_err(program_name, 0,
- _("bad num inodes - %s"), optarg);
- exit(1);
- }
- break;
- case 'O':
- fs_features = optarg;
- break;
- case 'E':
- case 'R':
- extended_opts = optarg;
- break;
case 'S':
super_only = 1;
break;
@@ -1545,6 +1572,9 @@ profile_error:
case 'U':
fs_uuid = optarg;
break;
+ case 'v':
+ verbose = 1;
+ break;
case 'V':
/* Print version number and exit */
show_version_only++;
diff --git a/misc/mke2fs.conf.5.in b/misc/mke2fs.conf.5.in
index b6df7674..0625d0ef 100644
--- a/misc/mke2fs.conf.5.in
+++ b/misc/mke2fs.conf.5.in
@@ -11,7 +11,7 @@ is the configuration file for
.BR mke2fs (8).
It controls the default parameters used by
.BR mke2fs (8)
-when it is creating ext2 or ext3 filesystems.
+when it is creating ext2, ext3, or ext4 filesystems.
.PP
The
.I mke2fs.conf
diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index 81124cf2..e298bed4 100644
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -66,9 +66,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: e2fsprogs 1.42.7\n"
+"Project-Id-Version: e2fsprogs 1.42.8\n"
"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
-"POT-Creation-Date: 2013-01-21 21:46-0500\n"
+"POT-Creation-Date: 2013-06-16 08:17-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,7 +78,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: e2fsck/badblocks.c:23 misc/mke2fs.c:178
+#: e2fsck/badblocks.c:23 misc/mke2fs.c:180
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr ""
@@ -94,8 +94,8 @@ msgstr ""
#: e2fsck/badblocks.c:72 e2fsck/iscan.c:110 e2fsck/scantest.c:107
#: e2fsck/unix.c:1332 e2fsck/unix.c:1420 misc/badblocks.c:1214
#: misc/badblocks.c:1222 misc/badblocks.c:1236 misc/badblocks.c:1248
-#: misc/dumpe2fs.c:588 misc/e2image.c:1196 misc/e2image.c:1318
-#: misc/e2image.c:1331 misc/mke2fs.c:194 misc/tune2fs.c:1906 resize/main.c:315
+#: misc/dumpe2fs.c:588 misc/e2image.c:1196 misc/e2image.c:1324
+#: misc/e2image.c:1337 misc/mke2fs.c:196 misc/tune2fs.c:1907 resize/main.c:315
#, c-format
msgid "while trying to open %s"
msgstr ""
@@ -105,7 +105,7 @@ msgstr ""
msgid "while trying popen '%s'"
msgstr ""
-#: e2fsck/badblocks.c:94 misc/mke2fs.c:201
+#: e2fsck/badblocks.c:94 misc/mke2fs.c:203
msgid "while reading in list of bad blocks from file"
msgstr ""
@@ -212,31 +212,31 @@ msgstr ""
msgid "%u inodes scanned.\n"
msgstr ""
-#: e2fsck/journal.c:512
+#: e2fsck/journal.c:522
msgid "reading journal superblock\n"
msgstr ""
-#: e2fsck/journal.c:569
+#: e2fsck/journal.c:579
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr ""
-#: e2fsck/journal.c:578
+#: e2fsck/journal.c:588
#, c-format
msgid "%s: journal too short\n"
msgstr ""
-#: e2fsck/journal.c:870
+#: e2fsck/journal.c:880
#, c-format
msgid "%s: recovering journal\n"
msgstr ""
-#: e2fsck/journal.c:872
+#: e2fsck/journal.c:882
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr ""
-#: e2fsck/journal.c:899
+#: e2fsck/journal.c:909
#, c-format
msgid "while trying to re-open %s"
msgstr ""
@@ -438,23 +438,23 @@ msgstr ""
msgid "unknown file type with mode 0%o"
msgstr ""
-#: e2fsck/message.c:423
+#: e2fsck/message.c:422
msgid "indirect block"
msgstr ""
-#: e2fsck/message.c:425
+#: e2fsck/message.c:424
msgid "double indirect block"
msgstr ""
-#: e2fsck/message.c:427
+#: e2fsck/message.c:426
msgid "triple indirect block"
msgstr ""
-#: e2fsck/message.c:429
+#: e2fsck/message.c:428
msgid "translator block"
msgstr ""
-#: e2fsck/message.c:431
+#: e2fsck/message.c:430
msgid "block #"
msgstr ""
@@ -462,21 +462,21 @@ msgstr ""
msgid "multiply claimed inode map"
msgstr ""
-#: e2fsck/pass1b.c:610 e2fsck/pass1b.c:729
+#: e2fsck/pass1b.c:610 e2fsck/pass1b.c:730
#, c-format
msgid "internal error: can't find dup_blk for %llu\n"
msgstr ""
-#: e2fsck/pass1b.c:820
+#: e2fsck/pass1b.c:821
msgid "returned from clone_file_block"
msgstr ""
-#: e2fsck/pass1b.c:842
+#: e2fsck/pass1b.c:843
#, c-format
msgid "internal error: couldn't lookup EA block record for %llu"
msgstr ""
-#: e2fsck/pass1b.c:854
+#: e2fsck/pass1b.c:855
#, c-format
msgid "internal error: couldn't lookup EA inode record for %u"
msgstr ""
@@ -538,20 +538,20 @@ msgstr ""
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:2295
+#: e2fsck/pass1.c:2299
#, c-format
msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
msgstr ""
-#: e2fsck/pass1.c:2656
+#: e2fsck/pass1.c:2660
msgid "block bitmap"
msgstr ""
-#: e2fsck/pass1.c:2662
+#: e2fsck/pass1.c:2666
msgid "inode bitmap"
msgstr ""
-#: e2fsck/pass1.c:2668
+#: e2fsck/pass1.c:2672
msgid "inode table"
msgstr ""
@@ -1350,7 +1350,7 @@ msgstr ""
msgid "Warning: could not write @b %b for %s: %m\n"
msgstr ""
-#: e2fsck/problem.c:625 e2fsck/problem.c:1468
+#: e2fsck/problem.c:625 e2fsck/problem.c:1474
#. @-expanded: error allocating inode bitmap (%N): %m\n
msgid "@A @i @B (%N): %m\n"
msgstr ""
@@ -1713,7 +1713,15 @@ msgid ""
"Logical start %b does not match logical start %c at next level. "
msgstr ""
-#: e2fsck/problem.c:961
+#: e2fsck/problem.c:959
+#. @-expanded: inode %i, end of extent exceeds allowed value\n
+#. @-expanded: \t(logical block %c, physical block %b, len %N)\n
+msgid ""
+"@i %i, end of extent exceeds allowed value\n"
+"\t(logical @b %c, physical @b %b, len %N)\n"
+msgstr ""
+
+#: e2fsck/problem.c:967
#. @-expanded: \n
#. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
#. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n
@@ -1723,45 +1731,45 @@ msgid ""
"Pass 1B: Rescanning for @m @bs\n"
msgstr ""
-#: e2fsck/problem.c:967
+#: e2fsck/problem.c:973
#, c-format
#. @-expanded: multiply-claimed block(s) in inode %i:
msgid "@m @b(s) in @i %i:"
msgstr ""
-#: e2fsck/problem.c:982
+#: e2fsck/problem.c:988
#, c-format
msgid "Error while scanning inodes (%i): %m\n"
msgstr ""
-#: e2fsck/problem.c:987
+#: e2fsck/problem.c:993
#, c-format
#. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n
msgid "@A @i @B (@i_dup_map): %m\n"
msgstr ""
-#: e2fsck/problem.c:992
+#: e2fsck/problem.c:998
#, c-format
#. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n
msgid "Error while iterating over @bs in @i %i (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:997 e2fsck/problem.c:1312
+#: e2fsck/problem.c:1003 e2fsck/problem.c:1318
#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
msgstr ""
-#: e2fsck/problem.c:1002
+#: e2fsck/problem.c:1008
#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
msgstr ""
-#: e2fsck/problem.c:1008
+#: e2fsck/problem.c:1014
#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
msgid "Pass 1D: Reconciling @m @bs\n"
msgstr ""
-#: e2fsck/problem.c:1013
+#: e2fsck/problem.c:1019
#. @-expanded: File %Q (inode #%i, mod time %IM) \n
#. @-expanded: has %r multiply-claimed block(s), shared with %N file(s):\n
msgid ""
@@ -1769,17 +1777,17 @@ msgid ""
" has %r @m @b(s), shared with %N file(s):\n"
msgstr ""
-#: e2fsck/problem.c:1019
+#: e2fsck/problem.c:1025
#. @-expanded: \t%Q (inode #%i, mod time %IM)\n
msgid "\t%Q (@i #%i, mod time %IM)\n"
msgstr ""
-#: e2fsck/problem.c:1024
+#: e2fsck/problem.c:1030
#. @-expanded: \t<filesystem metadata>\n
msgid "\t<@f metadata>\n"
msgstr ""
-#: e2fsck/problem.c:1029
+#: e2fsck/problem.c:1035
#. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n
#. @-expanded: \n
msgid ""
@@ -1787,7 +1795,7 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1034
+#: e2fsck/problem.c:1040
#. @-expanded: multiply-claimed blocks already reassigned or cloned.\n
#. @-expanded: \n
msgid ""
@@ -1795,313 +1803,313 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1047
+#: e2fsck/problem.c:1053
#, c-format
msgid "Couldn't clone file: %m\n"
msgstr ""
-#: e2fsck/problem.c:1053
+#: e2fsck/problem.c:1059
#. @-expanded: Pass 2: Checking directory structure\n
msgid "Pass 2: Checking @d structure\n"
msgstr ""
-#: e2fsck/problem.c:1058
+#: e2fsck/problem.c:1064
#, c-format
#. @-expanded: invalid inode number for '.' in directory inode %i.\n
msgid "@n @i number for '.' in @d @i %i.\n"
msgstr ""
-#: e2fsck/problem.c:1063
+#: e2fsck/problem.c:1069
#. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n
msgid "@E has @n @i #: %Di.\n"
msgstr ""
-#: e2fsck/problem.c:1068
+#: e2fsck/problem.c:1074
#. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di.
msgid "@E has @D/unused @i %Di. "
msgstr ""
-#: e2fsck/problem.c:1073
+#: e2fsck/problem.c:1079
#. @-expanded: entry '%Dn' in %p (%i) is a link to '.'
msgid "@E @L to '.' "
msgstr ""
-#: e2fsck/problem.c:1078
+#: e2fsck/problem.c:1084
#. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
msgid "@E points to @i (%Di) located in a bad @b.\n"
msgstr ""
-#: e2fsck/problem.c:1083
+#: e2fsck/problem.c:1089
#. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
msgid "@E @L to @d %P (%Di).\n"
msgstr ""
-#: e2fsck/problem.c:1088
+#: e2fsck/problem.c:1094
#. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n
msgid "@E @L to the @r.\n"
msgstr ""
-#: e2fsck/problem.c:1093
+#: e2fsck/problem.c:1099
#. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n
msgid "@E has illegal characters in its name.\n"
msgstr ""
-#: e2fsck/problem.c:1098
+#: e2fsck/problem.c:1104
#, c-format
#. @-expanded: Missing '.' in directory inode %i.\n
msgid "Missing '.' in @d @i %i.\n"
msgstr ""
-#: e2fsck/problem.c:1103
+#: e2fsck/problem.c:1109
#, c-format
#. @-expanded: Missing '..' in directory inode %i.\n
msgid "Missing '..' in @d @i %i.\n"
msgstr ""
-#: e2fsck/problem.c:1108
+#: e2fsck/problem.c:1114
#. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
msgstr ""
-#: e2fsck/problem.c:1113
+#: e2fsck/problem.c:1119
#. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n"
msgstr ""
-#: e2fsck/problem.c:1118
+#: e2fsck/problem.c:1124
#. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n
msgid "i_faddr @F %IF, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1123
+#: e2fsck/problem.c:1129
#. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n
msgid "i_file_acl @F %If, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1128
+#: e2fsck/problem.c:1134
#. @-expanded: i_dir_acl for inode %i (%Q) is %Id, should be zero.\n
msgid "i_dir_acl @F %Id, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1133
+#: e2fsck/problem.c:1139
#. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n
msgid "i_frag @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1138
+#: e2fsck/problem.c:1144
#. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n
msgid "i_fsize @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1143
+#: e2fsck/problem.c:1149
#. @-expanded: inode %i (%Q) has invalid mode (%Im).\n
msgid "@i %i (%Q) has @n mode (%Im).\n"
msgstr ""
-#: e2fsck/problem.c:1148
+#: e2fsck/problem.c:1154
#. @-expanded: directory inode %i, %B, offset %N: directory corrupted\n
msgid "@d @i %i, %B, offset %N: @d corrupted\n"
msgstr ""
-#: e2fsck/problem.c:1153
+#: e2fsck/problem.c:1159
#. @-expanded: directory inode %i, %B, offset %N: filename too long\n
msgid "@d @i %i, %B, offset %N: filename too long\n"
msgstr ""
-#: e2fsck/problem.c:1158
+#: e2fsck/problem.c:1164
#. @-expanded: directory inode %i has an unallocated %B.
msgid "@d @i %i has an unallocated %B. "
msgstr ""
-#: e2fsck/problem.c:1163
+#: e2fsck/problem.c:1169
#, c-format
#. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n
msgid "'.' @d @e in @d @i %i is not NULL terminated\n"
msgstr ""
-#: e2fsck/problem.c:1168
+#: e2fsck/problem.c:1174
#, c-format
#. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n
msgid "'..' @d @e in @d @i %i is not NULL terminated\n"
msgstr ""
-#: e2fsck/problem.c:1173
+#: e2fsck/problem.c:1179
#. @-expanded: inode %i (%Q) is an illegal character device.\n
msgid "@i %i (%Q) is an @I character @v.\n"
msgstr ""
-#: e2fsck/problem.c:1178
+#: e2fsck/problem.c:1184
#. @-expanded: inode %i (%Q) is an illegal block device.\n
msgid "@i %i (%Q) is an @I @b @v.\n"
msgstr ""
-#: e2fsck/problem.c:1183
+#: e2fsck/problem.c:1189
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n
msgid "@E is duplicate '.' @e.\n"
msgstr ""
-#: e2fsck/problem.c:1188
+#: e2fsck/problem.c:1194
#. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n
msgid "@E is duplicate '..' @e.\n"
msgstr ""
-#: e2fsck/problem.c:1193 e2fsck/problem.c:1493
+#: e2fsck/problem.c:1199 e2fsck/problem.c:1499
#, c-format
msgid "Internal error: couldn't find dir_info for %i.\n"
msgstr ""
-#: e2fsck/problem.c:1198
+#: e2fsck/problem.c:1204
#. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n
msgid "@E has rec_len of %Dr, @s %N.\n"
msgstr ""
-#: e2fsck/problem.c:1203
+#: e2fsck/problem.c:1209
#, c-format
#. @-expanded: error allocating icount structure: %m\n
msgid "@A icount structure: %m\n"
msgstr ""
-#: e2fsck/problem.c:1208
+#: e2fsck/problem.c:1214
#, c-format
#. @-expanded: Error iterating over directory blocks: %m\n
msgid "Error iterating over @d @bs: %m\n"
msgstr ""
-#: e2fsck/problem.c:1213
+#: e2fsck/problem.c:1219
#. @-expanded: Error reading directory block %b (inode %i): %m\n
msgid "Error reading @d @b %b (@i %i): %m\n"
msgstr ""
-#: e2fsck/problem.c:1218
+#: e2fsck/problem.c:1224
#. @-expanded: Error writing directory block %b (inode %i): %m\n
msgid "Error writing @d @b %b (@i %i): %m\n"
msgstr ""
-#: e2fsck/problem.c:1223
+#: e2fsck/problem.c:1229
#, c-format
#. @-expanded: error allocating new directory block for inode %i (%s): %m\n
msgid "@A new @d @b for @i %i (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1228
+#: e2fsck/problem.c:1234
#, c-format
#. @-expanded: Error deallocating inode %i: %m\n
msgid "Error deallocating @i %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:1233
+#: e2fsck/problem.c:1239
#, c-format
#. @-expanded: directory entry for '.' in %p (%i) is big.\n
msgid "@d @e for '.' in %p (%i) is big.\n"
msgstr ""
-#: e2fsck/problem.c:1238
+#: e2fsck/problem.c:1244
#. @-expanded: inode %i (%Q) is an illegal FIFO.\n
msgid "@i %i (%Q) is an @I FIFO.\n"
msgstr ""
-#: e2fsck/problem.c:1243
+#: e2fsck/problem.c:1249
#. @-expanded: inode %i (%Q) is an illegal socket.\n
msgid "@i %i (%Q) is an @I socket.\n"
msgstr ""
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1254
#. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n
msgid "Setting filetype for @E to %N.\n"
msgstr ""
-#: e2fsck/problem.c:1253
+#: e2fsck/problem.c:1259
#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
msgstr ""
-#: e2fsck/problem.c:1258
+#: e2fsck/problem.c:1264
#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
msgid "@E has filetype set.\n"
msgstr ""
-#: e2fsck/problem.c:1263
+#: e2fsck/problem.c:1269
#. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n
msgid "@E has a @z name.\n"
msgstr ""
-#: e2fsck/problem.c:1268
+#: e2fsck/problem.c:1274
#. @-expanded: Symlink %Q (inode #%i) is invalid.\n
msgid "Symlink %Q (@i #%i) is @n.\n"
msgstr ""
-#: e2fsck/problem.c:1273
+#: e2fsck/problem.c:1279
#. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n
msgid "@a @b @F @n (%If).\n"
msgstr ""
-#: e2fsck/problem.c:1278
+#: e2fsck/problem.c:1284
#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
msgstr ""
-#: e2fsck/problem.c:1283
+#: e2fsck/problem.c:1289
#. @-expanded: problem in HTREE directory inode %d: %B not referenced\n
msgid "@p @h %d: %B not referenced\n"
msgstr ""
-#: e2fsck/problem.c:1288
+#: e2fsck/problem.c:1294
#. @-expanded: problem in HTREE directory inode %d: %B referenced twice\n
msgid "@p @h %d: %B referenced twice\n"
msgstr ""
-#: e2fsck/problem.c:1293
+#: e2fsck/problem.c:1299
#. @-expanded: problem in HTREE directory inode %d: %B has bad min hash\n
msgid "@p @h %d: %B has bad min hash\n"
msgstr ""
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1304
#. @-expanded: problem in HTREE directory inode %d: %B has bad max hash\n
msgid "@p @h %d: %B has bad max hash\n"
msgstr ""
-#: e2fsck/problem.c:1303
+#: e2fsck/problem.c:1309
#. @-expanded: invalid HTREE directory inode %d (%q).
msgid "@n @h %d (%q). "
msgstr ""
-#: e2fsck/problem.c:1307
+#: e2fsck/problem.c:1313
#. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n
msgid "@p @h %d (%q): bad @b number %b.\n"
msgstr ""
-#: e2fsck/problem.c:1317
+#: e2fsck/problem.c:1323
#, c-format
#. @-expanded: problem in HTREE directory inode %d: root node is invalid\n
msgid "@p @h %d: root node is @n\n"
msgstr ""
-#: e2fsck/problem.c:1322
+#: e2fsck/problem.c:1328
#. @-expanded: problem in HTREE directory inode %d: %B has invalid limit (%N)\n
msgid "@p @h %d: %B has @n limit (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1327
+#: e2fsck/problem.c:1333
#. @-expanded: problem in HTREE directory inode %d: %B has invalid count (%N)\n
msgid "@p @h %d: %B has @n count (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1338
#. @-expanded: problem in HTREE directory inode %d: %B has an unordered hash table\n
msgid "@p @h %d: %B has an unordered hash table\n"
msgstr ""
-#: e2fsck/problem.c:1337
+#: e2fsck/problem.c:1343
#. @-expanded: problem in HTREE directory inode %d: %B has invalid depth (%N)\n
msgid "@p @h %d: %B has @n depth (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1342
+#: e2fsck/problem.c:1348
#. @-expanded: Duplicate entry '%Dn' in %p (%i) found.
msgid "Duplicate @E found. "
msgstr ""
-#: e2fsck/problem.c:1347
+#: e2fsck/problem.c:1353
#, no-c-format
#. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n
#. @-expanded: Rename to %s
@@ -2110,7 +2118,7 @@ msgid ""
"Rename to %s"
msgstr ""
-#: e2fsck/problem.c:1352
+#: e2fsck/problem.c:1358
#. @-expanded: Duplicate entry '%Dn' found.\n
#. @-expanded: \tMarking %p (%i) to be rebuilt.\n
#. @-expanded: \n
@@ -2120,115 +2128,115 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1357
+#: e2fsck/problem.c:1363
#. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n
msgid "i_blocks_hi @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1362
+#: e2fsck/problem.c:1368
#. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n
msgid "Unexpected @b in @h %d (%q).\n"
msgstr ""
-#: e2fsck/problem.c:1366
+#: e2fsck/problem.c:1372
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
msgstr ""
-#: e2fsck/problem.c:1371
+#: e2fsck/problem.c:1377
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
msgstr ""
-#: e2fsck/problem.c:1376
+#: e2fsck/problem.c:1382
#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
msgid "i_file_acl_hi @F %N, @s zero.\n"
msgstr ""
-#: e2fsck/problem.c:1383
+#: e2fsck/problem.c:1389
#. @-expanded: Pass 3: Checking directory connectivity\n
msgid "Pass 3: Checking @d connectivity\n"
msgstr ""
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1394
#. @-expanded: root inode not allocated.
msgid "@r not allocated. "
msgstr ""
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1399
#. @-expanded: No room in lost+found directory.
msgid "No room in @l @d. "
msgstr ""
-#: e2fsck/problem.c:1398
+#: e2fsck/problem.c:1404
#, c-format
#. @-expanded: Unconnected directory inode %i (%p)\n
msgid "Unconnected @d @i %i (%p)\n"
msgstr ""
-#: e2fsck/problem.c:1403
+#: e2fsck/problem.c:1409
#. @-expanded: /lost+found not found.
msgid "/@l not found. "
msgstr ""
-#: e2fsck/problem.c:1408
+#: e2fsck/problem.c:1414
#. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
msgstr ""
-#: e2fsck/problem.c:1413
+#: e2fsck/problem.c:1419
#. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n
msgid "Bad or non-existent /@l. Cannot reconnect.\n"
msgstr ""
-#: e2fsck/problem.c:1418
+#: e2fsck/problem.c:1424
#, c-format
#. @-expanded: Could not expand /lost+found: %m\n
msgid "Could not expand /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1423
+#: e2fsck/problem.c:1429
#, c-format
msgid "Could not reconnect %i: %m\n"
msgstr ""
-#: e2fsck/problem.c:1428
+#: e2fsck/problem.c:1434
#, c-format
#. @-expanded: Error while trying to find /lost+found: %m\n
msgid "Error while trying to find /@l: %m\n"
msgstr ""
-#: e2fsck/problem.c:1433
+#: e2fsck/problem.c:1439
#, c-format
#. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1438
+#: e2fsck/problem.c:1444
#, c-format
#. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
msgstr ""
-#: e2fsck/problem.c:1443
+#: e2fsck/problem.c:1449
#, c-format
#. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
msgstr ""
-#: e2fsck/problem.c:1448
+#: e2fsck/problem.c:1454
#, c-format
#. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr ""
-#: e2fsck/problem.c:1453
+#: e2fsck/problem.c:1459
#, c-format
#. @-expanded: Error while adjusting inode count on inode %i\n
msgid "Error while adjusting @i count on @i %i\n"
msgstr ""
-#: e2fsck/problem.c:1458
+#: e2fsck/problem.c:1464
#, c-format
#. @-expanded: Couldn't fix parent of inode %i: %m\n
#. @-expanded: \n
@@ -2237,7 +2245,7 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1463
+#: e2fsck/problem.c:1469
#, c-format
#. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
#. @-expanded: \n
@@ -2246,73 +2254,73 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/problem.c:1473
+#: e2fsck/problem.c:1479
#, c-format
#. @-expanded: Error creating root directory (%s): %m\n
msgid "Error creating root @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1478
+#: e2fsck/problem.c:1484
#, c-format
#. @-expanded: Error creating /lost+found directory (%s): %m\n
msgid "Error creating /@l @d (%s): %m\n"
msgstr ""
-#: e2fsck/problem.c:1483
+#: e2fsck/problem.c:1489
#. @-expanded: root inode is not a directory; aborting.\n
msgid "@r is not a @d; aborting.\n"
msgstr ""
-#: e2fsck/problem.c:1488
+#: e2fsck/problem.c:1494
#. @-expanded: Cannot proceed without a root inode.\n
msgid "Cannot proceed without a @r.\n"
msgstr ""
-#: e2fsck/problem.c:1498
+#: e2fsck/problem.c:1504
#, c-format
#. @-expanded: /lost+found is not a directory (ino=%i)\n
msgid "/@l is not a @d (ino=%i)\n"
msgstr ""
-#: e2fsck/problem.c:1505
+#: e2fsck/problem.c:1511
msgid "Pass 3A: Optimizing directories\n"
msgstr ""
-#: e2fsck/problem.c:1510
+#: e2fsck/problem.c:1516
#, c-format
msgid "Failed to create dirs_to_hash iterator: %m\n"
msgstr ""
-#: e2fsck/problem.c:1515
+#: e2fsck/problem.c:1521
msgid "Failed to optimize directory %q (%d): %m\n"
msgstr ""
-#: e2fsck/problem.c:1520
+#: e2fsck/problem.c:1526
msgid "Optimizing directories: "
msgstr ""
-#: e2fsck/problem.c:1537
+#: e2fsck/problem.c:1543
msgid "Pass 4: Checking reference counts\n"
msgstr ""
-#: e2fsck/problem.c:1542
+#: e2fsck/problem.c:1548
#, c-format
#. @-expanded: unattached zero-length inode %i.
msgid "@u @z @i %i. "
msgstr ""
-#: e2fsck/problem.c:1547
+#: e2fsck/problem.c:1553
#, c-format
#. @-expanded: unattached inode %i\n
msgid "@u @i %i\n"
msgstr ""
-#: e2fsck/problem.c:1552
+#: e2fsck/problem.c:1558
#. @-expanded: inode %i ref count is %Il, should be %N.
msgid "@i %i ref count is %Il, @s %N. "
msgstr ""
-#: e2fsck/problem.c:1556
+#: e2fsck/problem.c:1562
#. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
#. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
#. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n
@@ -2322,57 +2330,57 @@ msgid ""
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They @s the same!\n"
msgstr ""
-#: e2fsck/problem.c:1566
+#: e2fsck/problem.c:1572
#. @-expanded: Pass 5: Checking group summary information\n
msgid "Pass 5: Checking @g summary information\n"
msgstr ""
-#: e2fsck/problem.c:1571
+#: e2fsck/problem.c:1577
#. @-expanded: Padding at end of inode bitmap is not set.
msgid "Padding at end of @i @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1576
+#: e2fsck/problem.c:1582
#. @-expanded: Padding at end of block bitmap is not set.
msgid "Padding at end of @b @B is not set. "
msgstr ""
-#: e2fsck/problem.c:1581
+#: e2fsck/problem.c:1587
#. @-expanded: block bitmap differences:
msgid "@b @B differences: "
msgstr ""
-#: e2fsck/problem.c:1601
+#: e2fsck/problem.c:1607
#. @-expanded: inode bitmap differences:
msgid "@i @B differences: "
msgstr ""
-#: e2fsck/problem.c:1621
+#: e2fsck/problem.c:1627
#. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1626
+#: e2fsck/problem.c:1632
#. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1631
+#: e2fsck/problem.c:1637
#. @-expanded: Free inodes count wrong (%i, counted=%j).\n
msgid "Free @is count wrong (%i, counted=%j).\n"
msgstr ""
-#: e2fsck/problem.c:1636
+#: e2fsck/problem.c:1642
#. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1641
+#: e2fsck/problem.c:1647
#. @-expanded: Free blocks count wrong (%b, counted=%c).\n
msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr ""
-#: e2fsck/problem.c:1646
+#: e2fsck/problem.c:1652
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
msgid ""
@@ -2380,49 +2388,49 @@ msgid ""
"endpoints (%i, %j)\n"
msgstr ""
-#: e2fsck/problem.c:1652
+#: e2fsck/problem.c:1658
msgid "Internal error: fudging end of bitmap (%N)\n"
msgstr ""
-#: e2fsck/problem.c:1657
+#: e2fsck/problem.c:1663
#, c-format
#. @-expanded: Error copying in replacement inode bitmap: %m\n
msgid "Error copying in replacement @i @B: %m\n"
msgstr ""
-#: e2fsck/problem.c:1662
+#: e2fsck/problem.c:1668
#, c-format
#. @-expanded: Error copying in replacement block bitmap: %m\n
msgid "Error copying in replacement @b @B: %m\n"
msgstr ""
-#: e2fsck/problem.c:1687
+#: e2fsck/problem.c:1693
#, c-format
#. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"
msgstr ""
-#: e2fsck/problem.c:1692
+#: e2fsck/problem.c:1698
#, c-format
#. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n
msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
msgstr ""
-#: e2fsck/problem.c:1699
+#: e2fsck/problem.c:1705
#. @-expanded: Recreate journal
msgid "Recreate @j"
msgstr ""
-#: e2fsck/problem.c:1704
+#: e2fsck/problem.c:1710
msgid "Update quota info for quota type %N"
msgstr ""
-#: e2fsck/problem.c:1823
+#: e2fsck/problem.c:1829
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr ""
-#: e2fsck/problem.c:1948 e2fsck/problem.c:1952
+#: e2fsck/problem.c:1954 e2fsck/problem.c:1958
msgid "IGNORED"
msgstr ""
@@ -2629,7 +2637,7 @@ msgid_plural "%12u files\n"
msgstr[0] ""
msgstr[1] ""
-#: e2fsck/unix.c:232 misc/badblocks.c:983 misc/tune2fs.c:1978 misc/util.c:147
+#: e2fsck/unix.c:232 misc/badblocks.c:983 misc/tune2fs.c:1985 misc/util.c:147
#: resize/main.c:259
#, c-format
msgid "while determining whether %s is mounted."
@@ -2757,8 +2765,8 @@ msgstr ""
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr ""
-#: e2fsck/unix.c:859 e2fsck/unix.c:931 misc/tune2fs.c:810 misc/tune2fs.c:1099
-#: misc/tune2fs.c:1117
+#: e2fsck/unix.c:859 e2fsck/unix.c:931 misc/tune2fs.c:811 misc/tune2fs.c:1100
+#: misc/tune2fs.c:1118
#, c-format
msgid "Unable to resolve '%s'"
msgstr ""
@@ -2806,7 +2814,7 @@ msgstr ""
msgid "while checking MMP block"
msgstr ""
-#: e2fsck/unix.c:1144 misc/tune2fs.c:1911
+#: e2fsck/unix.c:1144 misc/tune2fs.c:1912
msgid ""
"If you are sure the filesystem is not in use on any node, run:\n"
"'tune2fs -f -E clear_mmp {device}'\n"
@@ -3311,51 +3319,46 @@ msgstr ""
msgid "bad version - %s\n"
msgstr ""
-#: misc/chattr.c:202 misc/lsattr.c:116
+#: misc/chattr.c:201 misc/lsattr.c:116
#, c-format
msgid "while trying to stat %s"
msgstr ""
-#: misc/chattr.c:209
+#: misc/chattr.c:208
#, c-format
msgid "while reading flags on %s"
msgstr ""
-#: misc/chattr.c:218 misc/chattr.c:237
-#, c-format
-msgid "Clearing extent flag not supported on %s"
-msgstr ""
-
-#: misc/chattr.c:223 misc/chattr.c:242
+#: misc/chattr.c:213 misc/chattr.c:225
#, c-format
msgid "Flags of %s set as "
msgstr ""
-#: misc/chattr.c:251
+#: misc/chattr.c:234
#, c-format
msgid "while setting flags on %s"
msgstr ""
-#: misc/chattr.c:259
+#: misc/chattr.c:242
#, c-format
msgid "Version of %s set as %lu\n"
msgstr ""
-#: misc/chattr.c:263
+#: misc/chattr.c:246
#, c-format
msgid "while setting version on %s"
msgstr ""
-#: misc/chattr.c:283
+#: misc/chattr.c:266
#, c-format
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr ""
-#: misc/chattr.c:323
+#: misc/chattr.c:306
msgid "= is incompatible with - and +\n"
msgstr ""
-#: misc/chattr.c:331
+#: misc/chattr.c:314
msgid "Must use '-v', =, - or +\n"
msgstr ""
@@ -3524,7 +3527,7 @@ msgstr ""
msgid "Journal users: %s\n"
msgstr ""
-#: misc/dumpe2fs.c:442 misc/mke2fs.c:664 misc/tune2fs.c:1136
+#: misc/dumpe2fs.c:442 misc/mke2fs.c:666 misc/tune2fs.c:1137
#, c-format
msgid "Couldn't allocate memory to parse options!\n"
msgstr ""
@@ -3553,12 +3556,12 @@ msgid ""
"\tblocksize=<blocksize>\n"
msgstr ""
-#: misc/dumpe2fs.c:554 misc/mke2fs.c:1527
+#: misc/dumpe2fs.c:554 misc/mke2fs.c:1555
#, c-format
msgid "\tUsing %s\n"
msgstr ""
-#: misc/dumpe2fs.c:590 misc/e2image.c:1320 misc/tune2fs.c:1922
+#: misc/dumpe2fs.c:590 misc/e2image.c:1326 misc/tune2fs.c:1923
#: resize/main.c:317
#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
@@ -3601,7 +3604,7 @@ msgstr ""
msgid "while writing inode bitmap"
msgstr ""
-#: misc/e2image.c:1359
+#: misc/e2image.c:1365
#, c-format
msgid "while trying to convert qcow2 image (%s) into raw image (%s)"
msgstr ""
@@ -3626,7 +3629,7 @@ msgstr ""
msgid "e2label: not an ext2 filesystem\n"
msgstr ""
-#: misc/e2label.c:97 misc/tune2fs.c:2073
+#: misc/e2label.c:97 misc/tune2fs.c:2080
#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr ""
@@ -3641,7 +3644,7 @@ msgstr ""
msgid "e2label: error writing superblock\n"
msgstr ""
-#: misc/e2label.c:117 misc/tune2fs.c:802
+#: misc/e2label.c:117 misc/tune2fs.c:803
#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr ""
@@ -3807,7 +3810,7 @@ msgstr ""
msgid "While reading version on %s"
msgstr ""
-#: misc/mke2fs.c:114
+#: misc/mke2fs.c:116
#, c-format
msgid ""
"Usage: %s [-c|-l filename] [-b block-size] [-C cluster-size]\n"
@@ -3820,35 +3823,35 @@ msgid ""
"count]\n"
msgstr ""
-#: misc/mke2fs.c:219
+#: misc/mke2fs.c:221
#, c-format
msgid "Running command: %s\n"
msgstr ""
-#: misc/mke2fs.c:223
+#: misc/mke2fs.c:225
#, c-format
msgid "while trying to run '%s'"
msgstr ""
-#: misc/mke2fs.c:230
+#: misc/mke2fs.c:232
msgid "while processing list of bad blocks from program"
msgstr ""
-#: misc/mke2fs.c:257
+#: misc/mke2fs.c:259
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
-#: misc/mke2fs.c:259
+#: misc/mke2fs.c:261
#, c-format
msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
msgstr ""
-#: misc/mke2fs.c:262
+#: misc/mke2fs.c:264
msgid "Aborting....\n"
msgstr ""
-#: misc/mke2fs.c:282
+#: misc/mke2fs.c:284
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %u contain\n"
@@ -3856,31 +3859,31 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:301
+#: misc/mke2fs.c:303
msgid "while marking bad blocks as used"
msgstr ""
-#: misc/mke2fs.c:318
+#: misc/mke2fs.c:320
msgid "Writing inode tables: "
msgstr ""
-#: misc/mke2fs.c:339
+#: misc/mke2fs.c:341
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %llu: %s\n"
msgstr ""
-#: misc/mke2fs.c:353 misc/mke2fs.c:2227 misc/mke2fs.c:2481
+#: misc/mke2fs.c:355 misc/mke2fs.c:2257 misc/mke2fs.c:2512
#, c-format
msgid "done \n"
msgstr ""
-#: misc/mke2fs.c:364
+#: misc/mke2fs.c:366
msgid "while creating root dir"
msgstr ""
-#: misc/mke2fs.c:371
+#: misc/mke2fs.c:373
msgid "while reading root inode"
msgstr ""
@@ -3990,75 +3993,85 @@ msgstr ""
#: misc/mke2fs.c:589
#, c-format
+msgid "Root directory owner=%u:%u\n"
+msgstr ""
+
+#: misc/mke2fs.c:591
+#, c-format
msgid "Maximum filesystem blocks=%lu\n"
msgstr ""
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:595
#, c-format
msgid "%u block groups\n"
msgstr ""
-#: misc/mke2fs.c:595
+#: misc/mke2fs.c:597
#, c-format
msgid "%u block group\n"
msgstr ""
-#: misc/mke2fs.c:598
+#: misc/mke2fs.c:600
#, c-format
msgid "%u blocks per group, %u clusters per group\n"
msgstr ""
-#: misc/mke2fs.c:601
+#: misc/mke2fs.c:603
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr ""
-#: misc/mke2fs.c:603
+#: misc/mke2fs.c:605
#, c-format
msgid "%u inodes per group\n"
msgstr ""
-#: misc/mke2fs.c:610
+#: misc/mke2fs.c:612
#, c-format
msgid "Superblock backups stored on blocks: "
msgstr ""
-#: misc/mke2fs.c:689 misc/tune2fs.c:1164
+#: misc/mke2fs.c:691 misc/tune2fs.c:1165
#, c-format
msgid "Invalid mmp_update_interval: %s\n"
msgstr ""
-#: misc/mke2fs.c:703
+#: misc/mke2fs.c:705
#, c-format
msgid "Invalid stride parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:718
+#: misc/mke2fs.c:720
#, c-format
msgid "Invalid stripe-width parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:741
+#: misc/mke2fs.c:743
#, c-format
msgid "Invalid resize parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:748
+#: misc/mke2fs.c:750
#, c-format
msgid "The resize maximum must be greater than the filesystem size.\n"
msgstr ""
-#: misc/mke2fs.c:772
+#: misc/mke2fs.c:774
#, c-format
msgid "On-line resizing not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:810
+#: misc/mke2fs.c:801 misc/mke2fs.c:810
+#, c-format
+msgid "Invalid root_owner: '%s'\n"
+msgstr ""
+
+#: misc/mke2fs.c:835
#, c-format
msgid "Invalid quotatype parameter: %s\n"
msgstr ""
-#: misc/mke2fs.c:821
+#: misc/mke2fs.c:846
#, c-format
msgid ""
"\n"
@@ -4073,6 +4086,8 @@ msgid ""
"\tresize=<resize maximum size in blocks>\n"
"\tlazy_itable_init=<0 to disable, 1 to enable>\n"
"\tlazy_journal_init=<0 to disable, 1 to enable>\n"
+"\troot_uid=<uid of root directory>\n"
+"\troot_gid=<gid of root directory>\n"
"\ttest_fs\n"
"\tdiscard\n"
"\tnodiscard\n"
@@ -4080,7 +4095,7 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:841
+#: misc/mke2fs.c:868
#, c-format
msgid ""
"\n"
@@ -4088,43 +4103,43 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:880
+#: misc/mke2fs.c:907
#, c-format
msgid ""
"Syntax error in mke2fs config file (%s, line #%d)\n"
"\t%s\n"
msgstr ""
-#: misc/mke2fs.c:893 misc/tune2fs.c:397
+#: misc/mke2fs.c:920 misc/tune2fs.c:398
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr ""
-#: misc/mke2fs.c:905 misc/tune2fs.c:349
+#: misc/mke2fs.c:932 misc/tune2fs.c:349
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr ""
-#: misc/mke2fs.c:1045
+#: misc/mke2fs.c:1072
#, c-format
msgid ""
"\n"
"Your mke2fs.conf file does not define the %s filesystem type.\n"
msgstr ""
-#: misc/mke2fs.c:1049
+#: misc/mke2fs.c:1076
#, c-format
msgid ""
"You probably need to install an updated mke2fs.conf file.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:1053
+#: misc/mke2fs.c:1080
#, c-format
msgid "Aborting...\n"
msgstr ""
-#: misc/mke2fs.c:1093
+#: misc/mke2fs.c:1120
#, c-format
msgid ""
"\n"
@@ -4132,126 +4147,130 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1276
#, c-format
msgid "Couldn't allocate memory for new PATH.\n"
msgstr ""
-#: misc/mke2fs.c:1292
+#: misc/mke2fs.c:1317
#, c-format
msgid "Couldn't init profile successfully (error: %ld).\n"
msgstr ""
-#: misc/mke2fs.c:1332
+#: misc/mke2fs.c:1357
#, c-format
msgid "invalid block size - %s"
msgstr ""
-#: misc/mke2fs.c:1336
+#: misc/mke2fs.c:1361
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
-#: misc/mke2fs.c:1352
+#: misc/mke2fs.c:1377
#, c-format
msgid "invalid cluster size - %s"
msgstr ""
-#: misc/mke2fs.c:1364
+#: misc/mke2fs.c:1387
+msgid "'-R' is deprecated, use '-E' instead"
+msgstr ""
+
+#: misc/mke2fs.c:1399
msgid "Illegal number for blocks per group"
msgstr ""
-#: misc/mke2fs.c:1369
+#: misc/mke2fs.c:1404
msgid "blocks per group must be multiple of 8"
msgstr ""
-#: misc/mke2fs.c:1377
+#: misc/mke2fs.c:1412
msgid "Illegal number for flex_bg size"
msgstr ""
-#: misc/mke2fs.c:1383
+#: misc/mke2fs.c:1418
msgid "flex_bg size must be a power of 2"
msgstr ""
-#: misc/mke2fs.c:1393
+#: misc/mke2fs.c:1428
#, c-format
msgid "invalid inode ratio %s (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1403
+#: misc/mke2fs.c:1438
+#, c-format
+msgid "invalid inode size - %s"
+msgstr ""
+
+#: misc/mke2fs.c:1450
#, c-format
msgid ""
"Warning: -K option is deprecated and should not be used anymore. Use '-E "
"nodiscard' extended option instead!\n"
msgstr ""
-#: misc/mke2fs.c:1417
+#: misc/mke2fs.c:1460
msgid "in malloc for bad_blocks_filename"
msgstr ""
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1473
#, c-format
msgid "invalid reserved blocks percent - %s"
msgstr ""
-#: misc/mke2fs.c:1445
-#, c-format
-msgid "bad revision level - %s"
-msgstr ""
-
-#: misc/mke2fs.c:1457
+#: misc/mke2fs.c:1488
#, c-format
-msgid "invalid inode size - %s"
+msgid "bad num inodes - %s"
msgstr ""
-#: misc/mke2fs.c:1477
+#: misc/mke2fs.c:1505
#, c-format
-msgid "bad num inodes - %s"
+msgid "bad revision level - %s"
msgstr ""
-#: misc/mke2fs.c:1494
+#: misc/mke2fs.c:1519
msgid "The -t option may only be used once"
msgstr ""
-#: misc/mke2fs.c:1502
+#: misc/mke2fs.c:1527
msgid "The -T option may only be used once"
msgstr ""
-#: misc/mke2fs.c:1552 misc/mke2fs.c:2560
+#: misc/mke2fs.c:1580 misc/mke2fs.c:2591
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
-#: misc/mke2fs.c:1558
+#: misc/mke2fs.c:1586
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr ""
-#: misc/mke2fs.c:1564
+#: misc/mke2fs.c:1592
#, c-format
msgid "Using journal device's blocksize: %d\n"
msgstr ""
-#: misc/mke2fs.c:1575
+#: misc/mke2fs.c:1603
#, c-format
msgid "invalid blocks '%s' on device '%s'"
msgstr ""
-#: misc/mke2fs.c:1585
+#: misc/mke2fs.c:1613
msgid "filesystem"
msgstr ""
-#: misc/mke2fs.c:1598 resize/main.c:367
+#: misc/mke2fs.c:1626 resize/main.c:367
msgid "while trying to determine filesystem size"
msgstr ""
-#: misc/mke2fs.c:1604
+#: misc/mke2fs.c:1632
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
msgstr ""
-#: misc/mke2fs.c:1611
+#: misc/mke2fs.c:1639
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -4259,111 +4278,111 @@ msgid ""
"\tto re-read your partition table.\n"
msgstr ""
-#: misc/mke2fs.c:1628
+#: misc/mke2fs.c:1656
msgid "Filesystem larger than apparent device size."
msgstr ""
-#: misc/mke2fs.c:1648
+#: misc/mke2fs.c:1676
#, c-format
msgid "Failed to parse fs types list\n"
msgstr ""
-#: misc/mke2fs.c:1702
+#: misc/mke2fs.c:1730
#, c-format
msgid ""
"%s: Size of device (0x%llx blocks) %s too big to be expressed\n"
"\tin 32 bits using a blocksize of %d.\n"
msgstr ""
-#: misc/mke2fs.c:1718
+#: misc/mke2fs.c:1746
msgid "fs_types for mke2fs.conf resolution: "
msgstr ""
-#: misc/mke2fs.c:1725
+#: misc/mke2fs.c:1753
#, c-format
msgid "Filesystem features not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1732
+#: misc/mke2fs.c:1760
#, c-format
msgid "Sparse superblocks not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1744
+#: misc/mke2fs.c:1772
#, c-format
msgid "Journals not supported with revision 0 filesystems\n"
msgstr ""
-#: misc/mke2fs.c:1758
+#: misc/mke2fs.c:1786
#, c-format
msgid "invalid reserved blocks percent - %lf"
msgstr ""
-#: misc/mke2fs.c:1774
+#: misc/mke2fs.c:1802
#, c-format
msgid ""
"The resize_inode and meta_bg features are not compatible.\n"
"They can not be both enabled simultaneously.\n"
msgstr ""
-#: misc/mke2fs.c:1791
+#: misc/mke2fs.c:1819
msgid "while trying to determine hardware sector size"
msgstr ""
-#: misc/mke2fs.c:1797
+#: misc/mke2fs.c:1825
msgid "while trying to determine physical sector size"
msgstr ""
-#: misc/mke2fs.c:1830
+#: misc/mke2fs.c:1858
msgid "while setting blocksize; too small for device\n"
msgstr ""
-#: misc/mke2fs.c:1835
+#: misc/mke2fs.c:1863
#, c-format
msgid ""
"Warning: specified blocksize %d is less than device physical sectorsize %d\n"
msgstr ""
-#: misc/mke2fs.c:1853
+#: misc/mke2fs.c:1881
msgid "The cluster size may not be smaller than the block size.\n"
msgstr ""
-#: misc/mke2fs.c:1859
+#: misc/mke2fs.c:1887
msgid "specifying a cluster size requires the bigalloc feature"
msgstr ""
-#: misc/mke2fs.c:1878
+#: misc/mke2fs.c:1906
#, c-format
msgid "warning: Unable to get device geometry for %s\n"
msgstr ""
-#: misc/mke2fs.c:1881
+#: misc/mke2fs.c:1909
#, c-format
msgid "%s alignment is offset by %lu bytes.\n"
msgstr ""
-#: misc/mke2fs.c:1883
+#: misc/mke2fs.c:1911
#, c-format
msgid ""
"This may result in very poor performance, (re)-partitioning suggested.\n"
msgstr ""
-#: misc/mke2fs.c:1902
+#: misc/mke2fs.c:1930
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr ""
-#: misc/mke2fs.c:1906
+#: misc/mke2fs.c:1934
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
-#: misc/mke2fs.c:1940
+#: misc/mke2fs.c:1968
msgid "Can't support bigalloc feature without extents feature"
msgstr ""
-#: misc/mke2fs.c:1946
+#: misc/mke2fs.c:1975
#, c-format
msgid ""
"\n"
@@ -4372,7 +4391,7 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:1952 misc/tune2fs.c:739
+#: misc/mke2fs.c:1982 misc/tune2fs.c:740
#, c-format
msgid ""
"\n"
@@ -4381,34 +4400,34 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:1963
+#: misc/mke2fs.c:1993
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr ""
-#: misc/mke2fs.c:1972
+#: misc/mke2fs.c:2002
msgid "blocks per group count out of range"
msgstr ""
-#: misc/mke2fs.c:1996
+#: misc/mke2fs.c:2026
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
msgstr ""
-#: misc/mke2fs.c:2008
+#: misc/mke2fs.c:2038
#, c-format
msgid "invalid inode size %d (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:2026
+#: misc/mke2fs.c:2056
#, c-format
msgid "too many inodes (%llu), raise inode ratio?"
msgstr ""
-#: misc/mke2fs.c:2033
+#: misc/mke2fs.c:2063
#, c-format
msgid "too many inodes (%llu), specify < 2^32 inodes"
msgstr ""
-#: misc/mke2fs.c:2047
+#: misc/mke2fs.c:2077
#, c-format
msgid ""
"inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4416,7 +4435,7 @@ msgid ""
"\tor lower inode count (-N).\n"
msgstr ""
-#: misc/mke2fs.c:2166
+#: misc/mke2fs.c:2196
#, c-format
msgid ""
"Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4424,118 +4443,118 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:2180
+#: misc/mke2fs.c:2210
msgid "while trying to setup undo file\n"
msgstr ""
-#: misc/mke2fs.c:2206
+#: misc/mke2fs.c:2236
msgid "Discarding device blocks: "
msgstr ""
-#: misc/mke2fs.c:2222
+#: misc/mke2fs.c:2252
msgid "failed - "
msgstr ""
-#: misc/mke2fs.c:2329
+#: misc/mke2fs.c:2360
msgid "while setting up superblock"
msgstr ""
-#: misc/mke2fs.c:2338
+#: misc/mke2fs.c:2369
#, c-format
msgid "Discard succeeded and will return 0s - skipping inode table wipe\n"
msgstr ""
-#: misc/mke2fs.c:2421
+#: misc/mke2fs.c:2452
#, c-format
msgid "unknown os - %s"
msgstr ""
-#: misc/mke2fs.c:2473
+#: misc/mke2fs.c:2504
#, c-format
msgid "Allocating group tables: "
msgstr ""
-#: misc/mke2fs.c:2477
+#: misc/mke2fs.c:2508
msgid "while trying to allocate filesystem tables"
msgstr ""
-#: misc/mke2fs.c:2486
+#: misc/mke2fs.c:2517
msgid ""
"\n"
"\twhile converting subcluster bitmap"
msgstr ""
-#: misc/mke2fs.c:2529
+#: misc/mke2fs.c:2560
#, c-format
msgid "while zeroing block %llu at end of filesystem"
msgstr ""
-#: misc/mke2fs.c:2542
+#: misc/mke2fs.c:2573
msgid "while reserving blocks for online resize"
msgstr ""
-#: misc/mke2fs.c:2553 misc/tune2fs.c:644
+#: misc/mke2fs.c:2584 misc/tune2fs.c:645
msgid "journal"
msgstr ""
-#: misc/mke2fs.c:2565
+#: misc/mke2fs.c:2596
#, c-format
msgid "Adding journal to device %s: "
msgstr ""
-#: misc/mke2fs.c:2572
+#: misc/mke2fs.c:2603
#, c-format
msgid ""
"\n"
"\twhile trying to add journal to device %s"
msgstr ""
-#: misc/mke2fs.c:2577 misc/mke2fs.c:2609 misc/tune2fs.c:673 misc/tune2fs.c:687
+#: misc/mke2fs.c:2608 misc/mke2fs.c:2640 misc/tune2fs.c:674 misc/tune2fs.c:688
#, c-format
msgid "done\n"
msgstr ""
-#: misc/mke2fs.c:2586
+#: misc/mke2fs.c:2617
#, c-format
msgid "Skipping journal creation in super-only mode\n"
msgstr ""
-#: misc/mke2fs.c:2597
+#: misc/mke2fs.c:2628
#, c-format
msgid "Creating journal (%u blocks): "
msgstr ""
-#: misc/mke2fs.c:2605
+#: misc/mke2fs.c:2636
msgid ""
"\n"
"\twhile trying to create journal"
msgstr ""
-#: misc/mke2fs.c:2616 misc/tune2fs.c:450
+#: misc/mke2fs.c:2647 misc/tune2fs.c:451
#, c-format
msgid ""
"\n"
"Error while enabling multiple mount protection feature."
msgstr ""
-#: misc/mke2fs.c:2621
+#: misc/mke2fs.c:2652
#, c-format
msgid "Multiple mount protection is enabled with update interval %d seconds.\n"
msgstr ""
-#: misc/mke2fs.c:2634
+#: misc/mke2fs.c:2665
#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
-#: misc/mke2fs.c:2641
+#: misc/mke2fs.c:2672
#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
msgstr ""
-#: misc/mke2fs.c:2643
+#: misc/mke2fs.c:2674
#, c-format
msgid ""
"done\n"
@@ -4638,113 +4657,113 @@ msgstr ""
msgid "(and reboot afterwards!)\n"
msgstr ""
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:401
#, c-format
msgid "Clearing filesystem feature '%s' not supported.\n"
msgstr ""
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:407
#, c-format
msgid "Setting filesystem feature '%s' not supported.\n"
msgstr ""
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:416
msgid ""
"The has_journal feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:423
+#: misc/tune2fs.c:424
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
msgstr ""
-#: misc/tune2fs.c:442
+#: misc/tune2fs.c:443
msgid ""
"The multiple mount protection feature can't\n"
"be set if the filesystem is mounted or\n"
"read-only.\n"
msgstr ""
-#: misc/tune2fs.c:460
+#: misc/tune2fs.c:461
#, c-format
msgid "Multiple mount protection has been enabled with update interval %ds.\n"
msgstr ""
-#: misc/tune2fs.c:469
+#: misc/tune2fs.c:470
msgid ""
"The multiple mount protection feature cannot\n"
"be disabled if the filesystem is readonly.\n"
msgstr ""
-#: misc/tune2fs.c:477
+#: misc/tune2fs.c:478
msgid "Error while reading bitmaps\n"
msgstr ""
-#: misc/tune2fs.c:486
+#: misc/tune2fs.c:487
#, c-format
msgid "Magic number in MMP block does not match. expected: %x, actual: %x\n"
msgstr ""
-#: misc/tune2fs.c:491
+#: misc/tune2fs.c:492
msgid "while reading MMP block."
msgstr ""
-#: misc/tune2fs.c:523
+#: misc/tune2fs.c:524
msgid ""
"Clearing the flex_bg flag would cause the the filesystem to be\n"
"inconsistent.\n"
msgstr ""
-#: misc/tune2fs.c:534
+#: misc/tune2fs.c:535
msgid ""
"The huge_file feature may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:594
+#: misc/tune2fs.c:595
msgid ""
"\n"
"Warning: '^quota' option overrides '-Q'arguments.\n"
msgstr ""
-#: misc/tune2fs.c:639
+#: misc/tune2fs.c:640
msgid "The filesystem already has a journal.\n"
msgstr ""
-#: misc/tune2fs.c:657
+#: misc/tune2fs.c:658
#, c-format
msgid ""
"\n"
"\twhile trying to open journal on %s\n"
msgstr ""
-#: misc/tune2fs.c:661
+#: misc/tune2fs.c:662
#, c-format
msgid "Creating journal on device %s: "
msgstr ""
-#: misc/tune2fs.c:669
+#: misc/tune2fs.c:670
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr ""
-#: misc/tune2fs.c:675
+#: misc/tune2fs.c:676
msgid "Creating journal inode: "
msgstr ""
-#: misc/tune2fs.c:684
+#: misc/tune2fs.c:685
msgid ""
"\n"
"\twhile trying to create journal file"
msgstr ""
-#: misc/tune2fs.c:762
+#: misc/tune2fs.c:763
msgid "Couldn't allocate memory to parse quota options!\n"
msgstr ""
-#: misc/tune2fs.c:784
+#: misc/tune2fs.c:785
msgid ""
"\n"
"Bad quota options specified.\n"
@@ -4757,70 +4776,70 @@ msgid ""
"\n"
msgstr ""
-#: misc/tune2fs.c:845
+#: misc/tune2fs.c:846
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
-#: misc/tune2fs.c:869 misc/tune2fs.c:882
+#: misc/tune2fs.c:870 misc/tune2fs.c:883
#, c-format
msgid "bad mounts count - %s"
msgstr ""
-#: misc/tune2fs.c:898
+#: misc/tune2fs.c:899
#, c-format
msgid "bad error behavior - %s"
msgstr ""
-#: misc/tune2fs.c:925
+#: misc/tune2fs.c:926
#, c-format
msgid "bad gid/group name - %s"
msgstr ""
-#: misc/tune2fs.c:958
+#: misc/tune2fs.c:959
#, c-format
msgid "bad interval - %s"
msgstr ""
-#: misc/tune2fs.c:987
+#: misc/tune2fs.c:988
#, c-format
msgid "bad reserved block ratio - %s"
msgstr ""
-#: misc/tune2fs.c:1002
+#: misc/tune2fs.c:1003
msgid "-o may only be specified once"
msgstr ""
-#: misc/tune2fs.c:1011
+#: misc/tune2fs.c:1012
msgid "-O may only be specified once"
msgstr ""
-#: misc/tune2fs.c:1026
+#: misc/tune2fs.c:1027
#, c-format
msgid "bad reserved blocks count - %s"
msgstr ""
-#: misc/tune2fs.c:1055
+#: misc/tune2fs.c:1056
#, c-format
msgid "bad uid/user name - %s"
msgstr ""
-#: misc/tune2fs.c:1072
+#: misc/tune2fs.c:1073
#, c-format
msgid "bad inode size - %s"
msgstr ""
-#: misc/tune2fs.c:1079
+#: misc/tune2fs.c:1080
#, c-format
msgid "Inode size must be a power of two- %s"
msgstr ""
-#: misc/tune2fs.c:1173
+#: misc/tune2fs.c:1174
#, c-format
msgid "mmp_update_interval too big: %lu\n"
msgstr ""
-#: misc/tune2fs.c:1178
+#: misc/tune2fs.c:1179
#, c-format
msgid "Setting multiple mount protection update interval to %lu second\n"
msgid_plural ""
@@ -4828,27 +4847,27 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: misc/tune2fs.c:1201
+#: misc/tune2fs.c:1202
#, c-format
msgid "Invalid RAID stride: %s\n"
msgstr ""
-#: misc/tune2fs.c:1216
+#: misc/tune2fs.c:1217
#, c-format
msgid "Invalid RAID stripe-width: %s\n"
msgstr ""
-#: misc/tune2fs.c:1231
+#: misc/tune2fs.c:1232
#, c-format
msgid "Invalid hash algorithm: %s\n"
msgstr ""
-#: misc/tune2fs.c:1237
+#: misc/tune2fs.c:1238
#, c-format
msgid "Setting default hash algorithm to %s (%d)\n"
msgstr ""
-#: misc/tune2fs.c:1256
+#: misc/tune2fs.c:1257
#, c-format
msgid ""
"\n"
@@ -4867,46 +4886,46 @@ msgid ""
"\t^test_fs\n"
msgstr ""
-#: misc/tune2fs.c:1722
+#: misc/tune2fs.c:1723
msgid "Failed to read inode bitmap\n"
msgstr ""
-#: misc/tune2fs.c:1727
+#: misc/tune2fs.c:1728
msgid "Failed to read block bitmap\n"
msgstr ""
-#: misc/tune2fs.c:1744 resize/resize2fs.c:838
+#: misc/tune2fs.c:1745 resize/resize2fs.c:870
msgid "blocks to be moved"
msgstr ""
-#: misc/tune2fs.c:1747
+#: misc/tune2fs.c:1748
msgid "Failed to allocate block bitmap when increasing inode size\n"
msgstr ""
-#: misc/tune2fs.c:1753
+#: misc/tune2fs.c:1754
msgid "Not enough space to increase inode size \n"
msgstr ""
-#: misc/tune2fs.c:1758
+#: misc/tune2fs.c:1759
msgid "Failed to relocate blocks during inode resize \n"
msgstr ""
-#: misc/tune2fs.c:1790
+#: misc/tune2fs.c:1791
msgid ""
"Error in resizing the inode size.\n"
"Run e2undo to undo the file system changes. \n"
msgstr ""
-#: misc/tune2fs.c:1817
+#: misc/tune2fs.c:1818
msgid "Couldn't allocate memory for tdb filename\n"
msgstr ""
-#: misc/tune2fs.c:1839
+#: misc/tune2fs.c:1840
#, c-format
msgid "while trying to delete %s"
msgstr ""
-#: misc/tune2fs.c:1849
+#: misc/tune2fs.c:1850
#, c-format
msgid ""
"To undo the tune2fs operation please run the command\n"
@@ -4914,141 +4933,146 @@ msgid ""
"\n"
msgstr ""
-#: misc/tune2fs.c:1918
+#: misc/tune2fs.c:1919
#, c-format
msgid ""
"MMP block magic is bad. Try to fix it by running:\n"
"'e2fsck -f %s'\n"
msgstr ""
-#: misc/tune2fs.c:1936
+#: misc/tune2fs.c:1937
#, c-format
msgid "The inode size is already %lu\n"
msgstr ""
-#: misc/tune2fs.c:1942
+#: misc/tune2fs.c:1943
#, c-format
msgid "Shrinking the inode size is not supported\n"
msgstr ""
-#: misc/tune2fs.c:1989
+#: misc/tune2fs.c:1949
+#, c-format
+msgid "Invalid inode size %lu (max %d)\n"
+msgstr ""
+
+#: misc/tune2fs.c:1996
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:1995
+#: misc/tune2fs.c:2002
#, c-format
msgid "Setting current mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:2000
+#: misc/tune2fs.c:2007
#, c-format
msgid "Setting error behavior to %d\n"
msgstr ""
-#: misc/tune2fs.c:2005
+#: misc/tune2fs.c:2012
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:2010
+#: misc/tune2fs.c:2017
#, c-format
msgid "interval between checks is too big (%lu)"
msgstr ""
-#: misc/tune2fs.c:2017
+#: misc/tune2fs.c:2024
#, c-format
msgid "Setting interval between checks to %lu seconds\n"
msgstr ""
-#: misc/tune2fs.c:2024
+#: misc/tune2fs.c:2031
#, c-format
msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n"
msgstr ""
-#: misc/tune2fs.c:2030
+#: misc/tune2fs.c:2037
#, c-format
msgid "reserved blocks count is too big (%llu)"
msgstr ""
-#: misc/tune2fs.c:2037
+#: misc/tune2fs.c:2044
#, c-format
msgid "Setting reserved blocks count to %llu\n"
msgstr ""
-#: misc/tune2fs.c:2043
+#: misc/tune2fs.c:2050
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:2050
+#: misc/tune2fs.c:2057
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:2055
+#: misc/tune2fs.c:2062
msgid ""
"\n"
"Clearing the sparse superflag not supported.\n"
msgstr ""
-#: misc/tune2fs.c:2063
+#: misc/tune2fs.c:2070
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
-#: misc/tune2fs.c:2069
+#: misc/tune2fs.c:2076
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:2101
+#: misc/tune2fs.c:2108
msgid "Error in using clear_mmp. It must be used with -f\n"
msgstr ""
-#: misc/tune2fs.c:2119
+#: misc/tune2fs.c:2126
msgid ""
"The quota feature may only be changed when the filesystem is unmounted.\n"
msgstr ""
-#: misc/tune2fs.c:2152
+#: misc/tune2fs.c:2159
msgid "Invalid UUID format\n"
msgstr ""
-#: misc/tune2fs.c:2165
+#: misc/tune2fs.c:2172
msgid "The inode size may only be changed when the filesystem is unmounted.\n"
msgstr ""
-#: misc/tune2fs.c:2173
+#: misc/tune2fs.c:2180
msgid ""
"Changing the inode size not supported for filesystems with the flex_bg\n"
"feature enabled.\n"
msgstr ""
-#: misc/tune2fs.c:2186
+#: misc/tune2fs.c:2193
#, c-format
msgid "Setting inode size %lu\n"
msgstr ""
-#: misc/tune2fs.c:2189
+#: misc/tune2fs.c:2196
#, c-format
msgid "Failed to change inode size\n"
msgstr ""
-#: misc/tune2fs.c:2200
+#: misc/tune2fs.c:2207
#, c-format
msgid "Setting stride size to %d\n"
msgstr ""
-#: misc/tune2fs.c:2205
+#: misc/tune2fs.c:2212
#, c-format
msgid "Setting stripe width to %d\n"
msgstr ""
-#: misc/tune2fs.c:2212
+#: misc/tune2fs.c:2219
#, c-format
msgid "Setting extended default mount options to '%s'\n"
msgstr ""
@@ -5481,26 +5505,26 @@ msgid ""
"this system.\n"
msgstr ""
-#: resize/resize2fs.c:370
+#: resize/resize2fs.c:369
#, c-format
msgid "inodes (%llu) must be less than %u"
msgstr ""
-#: resize/resize2fs.c:603
+#: resize/resize2fs.c:631
msgid "reserved blocks"
msgstr ""
-#: resize/resize2fs.c:843
+#: resize/resize2fs.c:875
msgid "meta-data blocks"
msgstr ""
-#: resize/resize2fs.c:1805
+#: resize/resize2fs.c:1837
#, c-format
msgid "Should never happen: resize inode corrupt!\n"
msgstr ""
#: lib/ext2fs/ext2_err.c:11
-msgid "EXT2FS Library version 1.42.7"
+msgid "EXT2FS Library version 1.42.8"
msgstr ""
#: lib/ext2fs/ext2_err.c:12
diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index 9b687eb4..39727ba6 100644
--- a/tests/d_loaddump/script
+++ b/tests/d_loaddump/script
@@ -24,19 +24,19 @@ echo "debugfs -R ''write $TEST_DATA test_data'' -w test.img" > $OUT.new
$DEBUGFS -R "write $TEST_DATA test_data" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
$FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''dump test_data $VERIFY_DATA'' test.img" > $OUT.new
$DEBUGFS -R "dump test_data $VERIFY_DATA" $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "cmp $TEST_DATA $VERIFY_DATA" >> $OUT
cmp $TEST_DATA $VERIFY_DATA >>$OUT
diff --git a/tests/d_special_files/script b/tests/d_special_files/script
index 85cbb4d8..1a1999a0 100644
--- a/tests/d_special_files/script
+++ b/tests/d_special_files/script
@@ -33,43 +33,43 @@ echo "debugfs -R ''stat foo'' -w test.img" > $OUT.new
$DEBUGFS -R "stat foo" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat foo2'' -w test.img" > $OUT.new
$DEBUGFS -R "stat foo2" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''block_dump 28'' -w test.img" > $OUT.new
$DEBUGFS -R "block_dump 28" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat pipe'' -w test.img" > $OUT.new
$DEBUGFS -R "stat pipe" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat sda'' -w test.img" > $OUT.new
$DEBUGFS -R "stat sda" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo "debugfs -R ''stat null'' -w test.img" > $OUT.new
$DEBUGFS -R "stat null" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
$FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
#
# Do the verification
diff --git a/tests/f_jnl_32bit/expect.0 b/tests/f_jnl_32bit/expect.0
index 29b180fd..b7de48ea 100644
--- a/tests/f_jnl_32bit/expect.0
+++ b/tests/f_jnl_32bit/expect.0
@@ -1,4 +1,3 @@
-
Journal starts at block 1, transaction 2
Found expected sequence 2, type 1 (descriptor block) at block 1
Dumping descriptor block, sequence 2, at block 1:
diff --git a/tests/f_jnl_32bit/script b/tests/f_jnl_32bit/script
index 4056f0de..9fb4366d 100644
--- a/tests/f_jnl_32bit/script
+++ b/tests/f_jnl_32bit/script
@@ -1,4 +1,4 @@
-PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs > $test_name.0.log'
+PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $test_name.0.log'
PASS_ZERO=true
. $cmd_dir/run_e2fsck
diff --git a/tests/f_jnl_64bit/expect.0 b/tests/f_jnl_64bit/expect.0
index 1b210571..2007f039 100644
--- a/tests/f_jnl_64bit/expect.0
+++ b/tests/f_jnl_64bit/expect.0
@@ -1,4 +1,3 @@
-
Journal starts at block 67, transaction 32
Found expected sequence 32, type 5 (revoke table) at block 67
Dumping revoke block, sequence 32, at block 67:
diff --git a/tests/f_jnl_64bit/script b/tests/f_jnl_64bit/script
index 4056f0de..9fb4366d 100644
--- a/tests/f_jnl_64bit/script
+++ b/tests/f_jnl_64bit/script
@@ -1,4 +1,4 @@
-PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs > $test_name.0.log'
+PREP_CMD='$DEBUGFS -R "logdump -a" $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $test_name.0.log'
PASS_ZERO=true
. $cmd_dir/run_e2fsck
diff --git a/tests/f_jnl_errno/expect.0 b/tests/f_jnl_errno/expect.0
index 7dae17d0..6dad72a1 100644
--- a/tests/f_jnl_errno/expect.0
+++ b/tests/f_jnl_errno/expect.0
@@ -1,4 +1,3 @@
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/f_jnl_errno/script b/tests/f_jnl_errno/script
index dd1ffd6c..ef5006a8 100644
--- a/tests/f_jnl_errno/script
+++ b/tests/f_jnl_errno/script
@@ -1,4 +1,4 @@
-AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs > $test_name.0.log'
+AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $test_name.0.log'
PASS_ZERO=true
. $cmd_dir/run_e2fsck
diff --git a/tests/f_orphan_indirect_inode/expect.1 b/tests/f_orphan_indirect_inode/expect.1
index 33cdd65e..814a6888 100644
--- a/tests/f_orphan_indirect_inode/expect.1
+++ b/tests/f_orphan_indirect_inode/expect.1
@@ -1,2 +1,3 @@
+test_filesys: Truncating orphaned inode 12 (uid=0, gid=0, mode=0100644, size=0)
test_filesys: clean, 12/16 files, 21/100 blocks
Exit status is 0
diff --git a/tests/f_preen/expect.1 b/tests/f_preen/expect.1
index c65209dd..dd20572a 100644
--- a/tests/f_preen/expect.1
+++ b/tests/f_preen/expect.1
@@ -1,3 +1,4 @@
+test_filesys: Note: if several inode or block bitmap blocks or part
of the inode table require relocation, you may wish to try
running e2fsck with the '-b 8193' option first. The problem
may lie only with the primary block group descriptors, and
diff --git a/tests/f_resize_inode/script b/tests/f_resize_inode/script
index 840432da..190871b4 100644
--- a/tests/f_resize_inode/script
+++ b/tests/f_resize_inode/script
@@ -15,15 +15,13 @@ cp /dev/null $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT
-$MKE2FS -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 \
- | sed -e '1d' | grep -v "automatically checked" |
- grep -v 'Discarding device blocks' |
- grep -v "whichever comes first" >> $OUT
+$MKE2FS -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
echo ----------------------------------------------- >> $OUT
@@ -33,18 +31,18 @@ echo "debugfs -R ''set_inode_field <7> block[2] 42'' -w test.img" > $OUT.new
$DEBUGFS -R "set_inode_field <7> block[2] 42" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
echo ----------------------------------------------- >> $OUT
@@ -54,18 +52,18 @@ echo "debugfs -R ''clri <7>'' -w test.img" > $OUT.new
$DEBUGFS -R "clri <7>" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
echo ----------------------------------------------- >> $OUT
@@ -75,18 +73,18 @@ echo "debugfs -R ''set_inode_field <7> bmap[524] 57'' -w test.img" > $OUT.new
$DEBUGFS -R "set_inode_field <7> bmap[524] 57" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
echo ----------------------------------------------- >> $OUT
@@ -96,12 +94,12 @@ echo "debugfs -R ''set_super_value reserved_gdt_blocks 15679'' -w test.img" > $O
$DEBUGFS -R "set_super_value reserved_gdt_blocks 15679" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
echo ----------------------------------------------- >> $OUT
@@ -111,18 +109,18 @@ echo "debugfs -R ''set_super_value reserved_gdt_blocks 32'' -w test.img" > $OUT.
$DEBUGFS -R "set_super_value reserved_gdt_blocks 32" -w $TMPFILE >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '2d' $OUT.new >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
rm -f $OUT.new
diff --git a/tests/filter_dumpe2fs b/tests/filter.sed
index 75442178..91b956b7 100644
--- a/tests/filter_dumpe2fs
+++ b/tests/filter.sed
@@ -1,14 +1,19 @@
-1s/^.*$//
-/^Filesystem UUID:/d
+/^[dbgumpe2fsckrsiz]* [1-9]\.[0-9]*[.-][^ ]* ([0-9]*-[A-Za-z]*-[0-9]*)/d
+s/\\015//g
+/automatically checked/d
+/^Directory Hash Seed:/d
+/Discarding device blocks/d
/^Filesystem created:/d
/^Filesystem flags:/d
+/^Filesystem UUID:/d
+/^JFS DEBUG:/d
/^Last write time:/d
/^Last mount time:/d
/^Last checked:/d
-/^Directory Hash Seed:/d
-/^Next check after:/d
-/^Maximum mount count:/d
/^Lifetime writes:/d
+/^Maximum mount count:/d
+/^Next check after:/d
/Reserved blocks uid:/s/ (user .*)//
/Reserved blocks gid:/s/ (group .*)//
+/whichever comes first/d
/^ Checksum /d
diff --git a/tests/m_bigjournal/expect.1 b/tests/m_bigjournal/expect.1
index ad4a0351..312c2768 100644
--- a/tests/m_bigjournal/expect.1
+++ b/tests/m_bigjournal/expect.1
@@ -1,5 +1,4 @@
Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent flex_bg sparse_super large_file huge_file uninit_bg dir_nlink extra_isize
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -7,7 +6,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/1344 files (0.0% non-contiguous), 1286989/2750000 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1
index 61f6894b..0cbe3394 100644
--- a/tests/m_dasd_bs/expect.1
+++ b/tests/m_dasd_bs/expect.1
@@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 1104/32768 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_extent_journal/expect.1 b/tests/m_extent_journal/expect.1
index aaedf729..d5d7a244 100644
--- a/tests/m_extent_journal/expect.1
+++ b/tests/m_extent_journal/expect.1
@@ -19,7 +19,6 @@ Creating journal (4096 blocks): done
Writing superblocks and filesystem accounting information: done
Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent sparse_super
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -27,7 +26,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 7460/65536 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1
index 59a9b7f9..ced94317 100644
--- a/tests/m_large_file/expect.1
+++ b/tests/m_large_file/expect.1
@@ -16,7 +16,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super large_file
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -24,7 +23,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/64 files (0.0% non-contiguous), 17/16384 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1
index e7c2b2cc..ec10d6e0 100644
--- a/tests/m_meta_bg/expect.1
+++ b/tests/m_meta_bg/expect.1
@@ -17,7 +17,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr dir_index filetype meta_bg sparse_super
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -25,7 +24,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/32768 files (0.0% non-contiguous), 4389/131072 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_mkfs_overhead/script b/tests/m_mkfs_overhead/script
index 63612a89..c21da0c3 100644
--- a/tests/m_mkfs_overhead/script
+++ b/tests/m_mkfs_overhead/script
@@ -12,8 +12,8 @@ export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
cp /dev/null $OUT
-$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d | \
- sed -e "s;$TMPFILE;test.img;" | tr -d \\015 > $OUT
+$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" > $OUT
rm -f $TMPFILE
diff --git a/tests/m_mmp/expect.1 b/tests/m_mmp/expect.1
index 1f7737d8..e18aa771 100644
--- a/tests/m_mmp/expect.1
+++ b/tests/m_mmp/expect.1
@@ -19,7 +19,6 @@ Multiple mount protection is enabled with update interval 5 seconds.
Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype mmp sparse_super large_file
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -27,7 +26,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/65536 files (0.0% non-contiguous), 2093/65536 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1
index 8fa605bb..e7bf2dbf 100644
--- a/tests/m_no_opt/expect.1
+++ b/tests/m_no_opt/expect.1
@@ -17,7 +17,6 @@ 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
@@ -25,7 +24,6 @@ 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
diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1
index 0c357008..9548665e 100644
--- a/tests/m_raid_opt/expect.1
+++ b/tests/m_raid_opt/expect.1
@@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/32768 files (0.0% non-contiguous), 7238/131072 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_raid_opt/script b/tests/m_raid_opt/script
index 1e47cc13..296fe948 100644
--- a/tests/m_raid_opt/script
+++ b/tests/m_raid_opt/script
@@ -1,4 +1,4 @@
DESCRIPTION="raid options"
FS_SIZE=131072
-MKE2FS_OPTS="-R stride=13 -O sparse_super -g 1024"
+MKE2FS_OPTS="-E stride=13 -O sparse_super -g 1024"
. $cmd_dir/run_mke2fs
diff --git a/tests/m_root_owner/expect.1 b/tests/m_root_owner/expect.1
new file mode 100644
index 00000000..72b0e084
--- /dev/null
+++ b/tests/m_root_owner/expect.1
@@ -0,0 +1,65 @@
+Filesystem label=
+OS type: Linux
+Block size=1024 (log=0)
+Fragment size=1024 (log=0)
+Stride=0 blocks, Stripe width=0 blocks
+128 inodes, 1024 blocks
+51 blocks (4.98%) reserved for the super user
+First data block=1
+Root directory owner=1234:1234
+Maximum filesystem blocks=1048576
+1 block group
+8192 blocks per group, 8192 fragments per group
+128 inodes per group
+
+Allocating group tables: done
+Writing inode tables: done
+Writing superblocks and filesystem accounting information: done
+
+Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
+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/128 files (0.0% non-contiguous), 38/1024 blocks
+Exit status is 0
+Filesystem volume name: <none>
+Last mounted on: <not available>
+Filesystem magic number: 0xEF53
+Filesystem revision #: 1 (dynamic)
+Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
+Default mount options: (none)
+Filesystem state: clean
+Errors behavior: Continue
+Filesystem OS type: Linux
+Inode count: 128
+Block count: 1024
+Reserved block count: 51
+Free blocks: 986
+Free inodes: 117
+First block: 1
+Block size: 1024
+Fragment size: 1024
+Reserved GDT blocks: 3
+Blocks per group: 8192
+Fragments per group: 8192
+Inodes per group: 128
+Inode blocks per group: 16
+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: half_md4
+
+
+Group 0: (Blocks 1-1023)
+ Primary superblock at 1, Group descriptors at 2-2
+ Reserved GDT blocks at 3-5
+ Block bitmap at 6 (+5), Inode bitmap at 7 (+6)
+ Inode table at 8-23 (+7)
+ 986 free blocks, 117 free inodes, 2 directories
+ Free blocks: 38-1023
+ Free inodes: 12-128
diff --git a/tests/m_root_owner/script b/tests/m_root_owner/script
new file mode 100644
index 00000000..02c5ef62
--- /dev/null
+++ b/tests/m_root_owner/script
@@ -0,0 +1,4 @@
+DESCRIPTION="root directory owner"
+FS_SIZE=1024
+MKE2FS_OPTS="-E root_owner=1234:1234"
+. $cmd_dir/run_mke2fs
diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1
index 23876ece..f3565319 100644
--- a/tests/m_std/expect.1
+++ b/tests/m_std/expect.1
@@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 3364/65536 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1
index f2852149..3212e103 100644
--- a/tests/m_uninit/expect.1
+++ b/tests/m_uninit/expect.1
@@ -18,7 +18,6 @@ Writing inode tables: done
Writing superblocks and filesystem accounting information: done
Filesystem features: ext_attr resize_inode dir_index filetype sparse_super uninit_bg
-
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
@@ -26,7 +25,6 @@ Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 11/32768 files (0.0% non-contiguous), 5691/131072 blocks
Exit status is 0
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/r_inline_xattr/script b/tests/r_inline_xattr/script
index 021088e0..d8825872 100644
--- a/tests/r_inline_xattr/script
+++ b/tests/r_inline_xattr/script
@@ -20,7 +20,7 @@ echo "resize2fs test.img 5M" >> $OUT
$RESIZE2FS $TMPFILE 5M 2>&1 >> $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e "s;$TMPFILE;test.img;" >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
# Look at inline extended attribute in resized fs
echo "debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|name = ''" >> $OUT
diff --git a/tests/r_move_itable/expect b/tests/r_move_itable/expect
index 195bb114..b4b089bf 100644
--- a/tests/r_move_itable/expect
+++ b/tests/r_move_itable/expect
@@ -13,7 +13,6 @@ Pass 5: Checking group summary information
test_filesys: 11/1248 files (0.0% non-contiguous), 1281/9985 blocks
Exit status is 0
dumpe2fs test.img
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
@@ -312,7 +311,6 @@ Pass 5: Checking group summary information
test_filesys: 11/2496 files (0.0% non-contiguous), 1644/19969 blocks
Exit status is 0
dumpe2fs test.img
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
@@ -847,7 +845,6 @@ Pass 5: Checking group summary information
test_filesys: 11/3744 files (0.0% non-contiguous), 2007/29953 blocks
Exit status is 0
dumpe2fs test.img
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
@@ -1618,7 +1615,6 @@ Pass 5: Checking group summary information
test_filesys: 11/5024 files (0.0% non-contiguous), 2376/40000 blocks
Exit status is 0
dumpe2fs test.img
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/r_move_itable/script b/tests/r_move_itable/script
index fc8286f6..e5678882 100644
--- a/tests/r_move_itable/script
+++ b/tests/r_move_itable/script
@@ -14,18 +14,17 @@ cp /dev/null $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -q -F -o Linux -b 1024 -g 256 test.img 1024 > $OUT
-$MKE2FS -q -F -o Linux -b 1024 -g 256 $TMPFILE 1024 2>&1 \
- | sed -e '1d' | grep -v "automatically checked" |
- grep -v "whichever comes first" >> $OUT
+$MKE2FS -q -F -o Linux -b 1024 -g 256 $TMPFILE 1024 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
echo resize2fs -p test.img 10000 >> $OUT
-$RESIZE2FS -p $TMPFILE 10000 2>&1 | sed -e '1d' | \
- sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS -p $TMPFILE 10000 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -34,18 +33,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT
echo resize2fs -p test.img 20000 >> $OUT
-$RESIZE2FS -p $TMPFILE 20000 2>&1 | sed -e '1d' | \
- sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS -p $TMPFILE 20000 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -54,18 +53,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT
echo resize2fs -p test.img 30000 >> $OUT
-$RESIZE2FS -p $TMPFILE 30000 2>&1 | sed -e '1d' | \
- sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS -p $TMPFILE 30000 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -74,18 +73,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT
echo resize2fs -p test.img 40000 >> $OUT
-$RESIZE2FS -p $TMPFILE 40000 2>&1 | sed -e '1d' | \
- sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS -p $TMPFILE 40000 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -94,7 +93,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
rm -f $TMPFILE
diff --git a/tests/r_resize_inode/expect b/tests/r_resize_inode/expect
index f9f79c46..786fe133 100644
--- a/tests/r_resize_inode/expect
+++ b/tests/r_resize_inode/expect
@@ -11,7 +11,6 @@ Pass 5: Checking group summary information
test_filesys: 11/16384 files (0.0% non-contiguous), 4513/65536 blocks
Exit status is 0
dumpe2fs test.img
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
@@ -459,7 +458,6 @@ Pass 5: Checking group summary information
test_filesys: 11/4096 files (0.0% non-contiguous), 2107/16384 blocks
Exit status is 0
dumpe2fs test.img
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
@@ -614,7 +612,6 @@ Pass 5: Checking group summary information
test_filesys: 11/41472 files (0.0% non-contiguous), 8361/165536 blocks
Exit status is 0
dumpe2fs test.img
-
Filesystem volume name: <none>
Last mounted on: <not available>
Filesystem magic number: 0xEF53
diff --git a/tests/r_resize_inode/script b/tests/r_resize_inode/script
index da3c2ede..0f121383 100644
--- a/tests/r_resize_inode/script
+++ b/tests/r_resize_inode/script
@@ -14,18 +14,17 @@ cp /dev/null $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT
-$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 \
- | sed -e '1d' | grep -v "automatically checked" |
- grep -v "whichever comes first" >> $OUT
+$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
echo resize2fs test.img 65536 >> $OUT
-$RESIZE2FS $TMPFILE 65536 2>&1 | sed -e '1d' | \
- sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS $TMPFILE 65536 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -34,25 +33,24 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT
dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 >> $OUT
-$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 2>&1 \
- | sed -e '1d' | grep -v "automatically checked" |
- grep -v "whichever comes first" >> $OUT
+$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
echo resize2fs test.img 16384 >> $OUT
-$RESIZE2FS $TMPFILE 16384 2>&1 | sed -e '1d' | \
- sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS $TMPFILE 16384 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -61,18 +59,18 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
echo "--------------------------------" >> $OUT
echo resize2fs test.img 165536 >> $OUT
-$RESIZE2FS $TMPFILE 165536 2>&1 | sed -e '1d' | \
- sed -e "s;$TMPFILE;test.img;" >> $OUT
+$RESIZE2FS $TMPFILE 165536 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT.new 2>&1
status=$?
echo Exit status is $status >> $OUT.new
-sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d' | tr -d \\015 >> $OUT
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT
rm -f $OUT.new
$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
@@ -81,7 +79,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
$TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1
echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
rm -f $TMPFILE
cmp -s $OUT $EXP
diff --git a/tests/run_e2fsck b/tests/run_e2fsck
index ab623e87..5f28d921 100644
--- a/tests/run_e2fsck
+++ b/tests/run_e2fsck
@@ -50,16 +50,14 @@ eval $PREP_CMD
$FSCK $FSCK_OPT -N test_filesys $TMPFILE > $OUT1.new 2>&1
status=$?
echo Exit status is $status >> $OUT1.new
-sed -e '1d' $OUT1.new | sed -e '/^JFS DEBUG:/d' | \
- sed -e "s;$TMPFILE;test.img;" | tr -d \\015 >> $OUT1
+sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT1.new >> $OUT1
rm -f $OUT1.new
if [ "$ONE_PASS_ONLY" != "true" ]; then
$FSCK $SECOND_FSCK_OPT -N test_filesys $TMPFILE > $OUT2.new 2>&1
status=$?
echo Exit status is $status >> $OUT2.new
- sed -e '1d' $OUT2.new | sed -e '/^JFS DEBUG:/d' | \
- sed -e "s;$TMPFILE;test.img;" > $OUT2
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT2.new > $OUT2
rm -f $OUT2.new
fi
diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index f5249968..82eca41a 100644
--- a/tests/run_mke2fs
+++ b/tests/run_mke2fs
@@ -11,8 +11,11 @@ MKE2FS_SKIP_PROGRESS=true
MKE2FS_SKIP_CHECK_MSG=true
export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
> $TMPFILE
-PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d | grep -v "Discarding device blocks" | tr -d \\015 > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d | tr -d \\015 >> $OUT1 ; echo " " >> $OUT1'
-AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs | tr -d \\015 >> $OUT1'
+PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" > $OUT1;
+ $DEBUGFS -R features $TMPFILE 2>&1 |
+ sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" >> $OUT1'
+AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT1'
. $cmd_dir/run_e2fsck
else #if test -x $DEBUGFS_EXE; then
diff --git a/version.h b/version.h
index 10be88db..d22de654 100644
--- a/version.h
+++ b/version.h
@@ -8,4 +8,5 @@
*/
#define E2FSPROGS_VERSION "1.43-WIP"
-#define E2FSPROGS_DATE "21-Jan-2013"
+#define E2FSPROGS_DATE "16-Jun-2013"
+