Patchwork e2fsprogs: silence debugfs

login
register
mail settings
Submitter Ross Burton
Date Dec. 23, 2013, 1:38 p.m.
Message ID <1387805914-15341-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/63673/
State Accepted
Commit 3814e34213baf030fa2a126d043ffd743fd2f9af
Headers show

Comments

Ross Burton - Dec. 23, 2013, 1:38 p.m.
debugfs echos the commands when it is executing a script, but as the scripts
used at rootfs time are long this massively inflates the do_rootfs log.

Comment out the echo so that the rootfs isn't 20K lines longer than it needs to
be.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch  |   19 +++++++++++++++++++
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb |    1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch

Patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch
new file mode 100644
index 0000000..830e9d5
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/quiet-debugfs.patch
@@ -0,0 +1,19 @@ 
+When executing a script don't echo every command, as we do this for entire
+filesystems at rootfs time.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
+index 5590295..ac57292 100644
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -2378,7 +2378,7 @@ static int source_file(const char *cmd_file, int ss_idx)
+ 		cp = strchr(buf, '\r');
+ 		if (cp)
+ 			*cp = 0;
+-		printf("debugfs: %s\n", buf);
++		/*printf("debugfs: %s\n", buf);*/
+ 		retval = ss_execute_line(ss_idx, buf);
+ 		if (retval) {
+ 			ss_perror(ss_idx, retval, buf);
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
index 22ad925..6175ce7 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.8.bb
@@ -9,6 +9,7 @@  SRC_URI += "file://acinclude.m4 \
             file://debugfs-extent-header.patch \
             file://populate-extfs.sh \
             file://e2fsprogs-fix-tests-f_extent_oobounds.patch \
+            file://quiet-debugfs.patch \
 "
 
 SRC_URI[md5sum] = "8ef664b6eb698aa6b733df59b17b9ed4"