From 2ff5d707f44948d28ba81b7910b305d162e04852 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Fri, 12 Jun 2009 12:07:20 -0500
Subject: [PATCH]   * bin/network-*: allow monitored network interface
 overrides in     ~/.byobu/network-interface, LP: #386364

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
---
 bin/network-down |  8 +++++++-
 bin/network-up   | 10 ++++++++--
 debian/changelog |  4 +++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bin/network-down b/bin/network-down
index 5c5ab97e..d08ed91d 100755
--- a/bin/network-down
+++ b/bin/network-down
@@ -20,9 +20,15 @@
 PKG="byobu"
 
 cache="/var/run/screen/S-$USER/$PKG.network-down"
-interface=`/sbin/route -n | tail -n 1 | sed "s/^.* //"`
 unit="kB/s"
 
+# Allow interface overrides in configuration directory
+if [ -r "$HOME/.$PKG/network-interface" ]; then
+	interface=`cat "$HOME/.$PKG/network-interface"`
+else
+	interface=`/sbin/route -n | tail -n 1 | sed "s/^.* //"`
+fi
+
 if [ "$1" = "--detail" ]; then
 	/sbin/ifconfig "$interface" | sed 's/\s*$//'
 	exit 0
diff --git a/bin/network-up b/bin/network-up
index 2f5e937c..17961843 100755
--- a/bin/network-up
+++ b/bin/network-up
@@ -20,10 +20,16 @@
 PKG="byobu"
 
 cache="/var/run/screen/S-$USER/$PKG.network-up"
-
-interface=`/sbin/route -n | tail -n 1 | sed "s/^.* //"`
 unit="kB/s"
 
+# Allow interface overrides in configuration directory
+if [ -r "$HOME/.$PKG/network-interface" ]; then
+	interface=`cat "$HOME/.$PKG/network-interface"`
+else
+	interface=`/sbin/route -n | tail -n 1 | sed "s/^.* //"`
+fi
+
+
 if [ "$1" = "--detail" ]; then
 	/sbin/ifconfig "$interface" | sed 's/\s*$//'
 	exit 0
diff --git a/debian/changelog b/debian/changelog
index 55f3eebc..adba1b19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ byobu (2.11) unreleased; urgency=low
     ctrl-a-), LP: #386363
   * screen-launcher-install, screen-launcher-uninstall: use
     .hushlogin to prevent double-printing of motd
+  * bin/network-*: allow monitored network interface overrides in
+    ~/.byobu/network-interface, LP: #386364
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 12 Jun 2009 12:02:10 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 12 Jun 2009 12:06:40 -0500
 
 byobu (2.10-0ubuntu1) karmic; urgency=low