From: Richard Jones <rjones@redhat.com>
Date: Mon, 23 Aug 2010 21:58:51 +0000 (+0100)
Subject: Don't print debug messages when not in verbose mode.
X-Git-Tag: 1.4.3~4
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=dcb4097d78eae4f71fbe7d119d122bc15bb7da57;p=libguestfs.git

Don't print debug messages when not in verbose mode.

Don't print them because no one's listening ...
(cherry picked from commit 5c1346dae72064f7fd9c2afe5517afc6f050cd9a)
---

diff --git a/appliance/init b/appliance/init
index b8133ca..6aeea0c 100755
--- a/appliance/init
+++ b/appliance/init
@@ -69,21 +69,23 @@ for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
 # http://kbase.redhat.com/faq/docs/DOC-5428
 for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
 
-# Keep these to enhance the usefulness of debug output.
-ls -l /dev
-cat /proc/mounts
-lvm pvs
-lvm vgs
-lvm lvs
-ifconfig
-netstat -rn
-lsmod
-#hwclock -r
-date
-#ping -n -v -c 5 10.0.2.2
-#ping -n -v -c 5 10.0.2.4
-
-echo -n "uptime: "; cat /proc/uptime
+# These are useful when debugging.
+if grep -sq guestfs_verbose=1 /proc/cmdline; then
+    ls -l /dev
+    cat /proc/mounts
+    lvm pvs
+    lvm vgs
+    lvm lvs
+    ifconfig
+    netstat -rn
+    lsmod
+    #hwclock -r
+    date
+    #ping -n -v -c 5 10.0.2.2
+    #ping -n -v -c 5 10.0.2.4
+
+    echo -n "uptime: "; cat /proc/uptime
+fi
 
 if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
   exec guestfsd -f