diff --git a/debian/changelog b/debian/changelog index f96f88e1..08c22e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ byobu (4.48) unreleased; urgency=low usr/share/doc/byobu/help.tmux.txt: - add a keybinding, Ctrl-Shift-F3/F4, to move a window right or left in the list + * usr/lib/byobu/ip_address: + - remove some first-launch noise, when ip address is not yet available -- Dustin Kirkland Wed, 09 Nov 2011 17:54:11 -0600 diff --git a/usr/lib/byobu/ip_address b/usr/lib/byobu/ip_address index 864b42f5..0269caec 100755 --- a/usr/lib/byobu/ip_address +++ b/usr/lib/byobu/ip_address @@ -41,7 +41,7 @@ __ip_address() { if [ "$IP_EXTERNAL" = "1" ]; then ipaddr=$(wget -O- -q http://v6.ipv6-test.com/api/myip.php) else - ipaddr=$(LC_ALL=C /sbin/ip -6 addr list dev "$interface" scope global) + ipaddr=$(LC_ALL=C /sbin/ip -6 addr list dev "$interface" scope global 2>/dev/null) # Print 'None' if we have no global address [ -z "$ipaddr" ] && ipaddr="None" ipaddr=${ipaddr#* inet6 } @@ -55,7 +55,7 @@ __ip_address() { # We're in EC2, so get our public IP address ipaddr=$(wget -q -O- http://169.254.169.254/latest/meta-data/public-ipv4) else - ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global) + ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global 2>/dev/null) ipaddr=${ipaddr#* inet } ipaddr=${ipaddr%%/*} fi