diff -Nru sosreport-3.1/debian/changelog sosreport-3.1/debian/changelog --- sosreport-3.1/debian/changelog 2014-04-04 21:08:07.000000000 +0000 +++ sosreport-3.1/debian/changelog 2014-04-08 13:58:08.000000000 +0000 @@ -1,3 +1,11 @@ +sosreport (3.1-1ubuntu2) trusty; urgency=medium + + * Fix spurious "command not found" messages when running (LP: #1303745) + * Add collection of /var/log/cloud-init*.log files (LP: #1301819) + * Add collection of configuration files in /etc/network/interfaces.d (LP: #1303723) + + -- Louis Bouchard Tue, 08 Apr 2014 08:58:08 -0500 + sosreport (3.1-1ubuntu1) trusty; urgency=low * Fix issues with using sosreport -a. (LP: #1302808) diff -Nru sosreport-3.1/debian/patches/collect-cloud-init-log.patch sosreport-3.1/debian/patches/collect-cloud-init-log.patch --- sosreport-3.1/debian/patches/collect-cloud-init-log.patch 1970-01-01 00:00:00.000000000 +0000 +++ sosreport-3.1/debian/patches/collect-cloud-init-log.patch 2014-04-08 13:58:04.000000000 +0000 @@ -0,0 +1,16 @@ +Add collection of /var/log/cloud-init.log + and /var/log/cloud-init-output.log if they exist. + +Author: Louis Bouchard +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1301819 +Origin: upstream, https://github.com/sosreport/sos/commit/36efd32ab01df2c076c3271543d674a515094375 +--- a/sos/plugins/logs.py ++++ b/sos/plugins/logs.py +@@ -36,6 +36,7 @@ + + self.limit = self.get_option("logsize") + self.add_copy_spec_limit("/var/log/boot*", sizelimit = self.limit) ++ self.add_copy_spec_limit("/var/log/cloud-init*", sizelimit = self.limit) + + if self.get_option('all_logs'): + logs = self.do_regex_find_all("^\S+\s+(-?\/.*$)\s+", diff -Nru sosreport-3.1/debian/patches/fix-command-not-found.patch sosreport-3.1/debian/patches/fix-command-not-found.patch --- sosreport-3.1/debian/patches/fix-command-not-found.patch 1970-01-01 00:00:00.000000000 +0000 +++ sosreport-3.1/debian/patches/fix-command-not-found.patch 2014-04-08 13:58:04.000000000 +0000 @@ -0,0 +1,31 @@ +Fix verbose file logging + + Prior versions of sos enable debug logging to the embedded log + file (sos_logs/sos.log) when a single '-v' is given. Restore this + behaviour and ensure that command-not-found messages are reported + at 'info' rather than 'warning' level. + +Author: Bryn M. Reeves +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303745 +Origin: upstream, https://github.com/sosreport/sos/commit/commit 0338a955a930286beaa7b66c5167be9b15d34d78 +--- a/sos/plugins/__init__.py ++++ b/sos/plugins/__init__.py +@@ -488,7 +488,7 @@ + self.soslog.warning("command '%s' timed out after %ds" + % (prog, timeout)) + if status == 127: +- self.soslog.warning("could not run '%s': command not found" % prog) ++ self.soslog.info("could not run '%s': command not found" % prog) + return (status, output, runtime) + + def call_ext_prog(self, prog, timeout=300): +--- a/sos/sosreport.py ++++ b/sos/sosreport.py +@@ -659,6 +659,7 @@ + flog.setLevel(logging.DEBUG) + elif self.opts.verbosity and self.opts.verbosity > 0: + console.setLevel(logging.INFO) ++ flog.setLevel(logging.DEBUG) + else: + console.setLevel(logging.WARNING) + self.soslog.addHandler(console) diff -Nru sosreport-3.1/debian/patches/get-interfaces.d.patch sosreport-3.1/debian/patches/get-interfaces.d.patch --- sosreport-3.1/debian/patches/get-interfaces.d.patch 1970-01-01 00:00:00.000000000 +0000 +++ sosreport-3.1/debian/patches/get-interfaces.d.patch 2014-04-08 13:58:04.000000000 +0000 @@ -0,0 +1,19 @@ +Add collection of /etc/network/interfaces.d for Ubuntu + + Since 14.04 Trusty, ubuntu uses config scripts in + /etc/network/interfaces.d. Collect those. + Closes: #264 + +Author: Louis Bouchard +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303723 +Origin: upstream, https://github.com/sosreport/sos/commit/f4dc6422e3008ae7ba060a0d469284dff5c5daad +--- a/sos/plugins/networking.py ++++ b/sos/plugins/networking.py +@@ -145,6 +145,7 @@ + self.add_copy_specs([ + "/etc/resolvconf", + "/etc/network/interfaces", ++ "/etc/network/interfaces.d", + "/etc/ufw", + "/var/log/ufw.Log", + "/etc/resolv.conf"]) diff -Nru sosreport-3.1/debian/patches/series sosreport-3.1/debian/patches/series --- sosreport-3.1/debian/patches/series 2014-04-04 21:02:55.000000000 +0000 +++ sosreport-3.1/debian/patches/series 2014-04-08 13:58:04.000000000 +0000 @@ -1,2 +1,5 @@ use_input_method_from_python_six.patch do_not_collect_isos_in_cobbler_plugin.patch +collect-cloud-init-log.patch +fix-command-not-found.patch +get-interfaces.d.patch