From ce970ecd235abd63c8e4c5d00ca05e128e370cc1 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 27 Jun 2011 04:39:10 -0400 Subject: [PATCH 1/3] * usr/lib/byobu/ec2_cost, usr/lib/byobu/hostname, usr/lib/byobu/ip_address: - use wget instead of host to check for metadata --- debian/changelog | 3 +++ usr/lib/byobu/ec2_cost | 2 +- usr/lib/byobu/hostname | 2 +- usr/lib/byobu/ip_address | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 362705af..a273ef2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ byobu (4.14) unreleased; urgency=low * usr/share/byobu/profiles/tmux: - getting tmux keybindings much closer! + * usr/lib/byobu/ec2_cost, usr/lib/byobu/hostname, + usr/lib/byobu/ip_address: + - use wget instead of host to check for metadata -- Dustin Kirkland Thu, 16 Jun 2011 16:16:29 -0500 diff --git a/usr/lib/byobu/ec2_cost b/usr/lib/byobu/ec2_cost index a396bf9a..c01e76e8 100755 --- a/usr/lib/byobu/ec2_cost +++ b/usr/lib/byobu/ec2_cost @@ -32,7 +32,7 @@ for arg in $@; do done # Try to use metadata service -if host 169.254.169.254 >/dev/null 2>&1; then +if wget -q -O- --timeout=1 http://169.254.169.254 >/dev/null 2>&1; then zone=$(wget -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone) . "$BYOBU_PREFIX/share/$PKG/ec2/rates.${zone%?}" type=$(wget -q -O - http://169.254.169.254/latest/meta-data/instance-type | sed -e "s/\./_/g") diff --git a/usr/lib/byobu/hostname b/usr/lib/byobu/hostname index 4460c206..8fa33321 100755 --- a/usr/lib/byobu/hostname +++ b/usr/lib/byobu/hostname @@ -26,7 +26,7 @@ if [ "$1" = "--detail" ]; then exit 0 fi -if host 169.254.169.254 >/dev/null 2>&1; then +if wget -q -O- --timeout=1 http://169.254.169.254 2>&1; then # We're in EC2, so get our public hostname h=$(wget -q -O - http://169.254.169.254/latest/meta-data/public-hostname) else diff --git a/usr/lib/byobu/ip_address b/usr/lib/byobu/ip_address index c06b4703..ed5c6df5 100755 --- a/usr/lib/byobu/ip_address +++ b/usr/lib/byobu/ip_address @@ -51,7 +51,7 @@ case "$IPV6" in ipaddr=${ipaddr%%/*} ;; *) - if host 169.254.169.254 >/dev/null 2>&1; then + if wget -q -O- --timeout=1 http://169.254.169.254 >/dev/null 2>&1; then # 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 From 7bf6daa1300dde126aaaa837d00bfc37aa1c58b2 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 27 Jun 2011 04:41:24 -0400 Subject: [PATCH 2/3] releasing 4.14 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a273ef2a..c05127bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -byobu (4.14) unreleased; urgency=low +byobu (4.14-0ubuntu1) oneiric; urgency=low * usr/share/byobu/profiles/tmux: - getting tmux keybindings much closer! @@ -6,7 +6,7 @@ byobu (4.14) unreleased; urgency=low usr/lib/byobu/ip_address: - use wget instead of host to check for metadata - -- Dustin Kirkland Thu, 16 Jun 2011 16:16:29 -0500 + -- Dustin Kirkland Mon, 27 Jun 2011 04:41:19 -0400 byobu (4.13-0ubuntu1) oneiric; urgency=low From 34d69370771828f750a273be22b77908371f04ab Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 27 Jun 2011 04:41:26 -0400 Subject: [PATCH 3/3] opening 4.15 --- debian/changelog | 6 ++++++ usr/bin/byobu | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c05127bf..7b9c05fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +byobu (4.15) unreleased; urgency=low + + * UNRELEASED + + -- Dustin Kirkland Mon, 27 Jun 2011 04:41:25 -0400 + byobu (4.14-0ubuntu1) oneiric; urgency=low * usr/share/byobu/profiles/tmux: diff --git a/usr/bin/byobu b/usr/bin/byobu index 52651b39..d79dfe95 100755 --- a/usr/bin/byobu +++ b/usr/bin/byobu @@ -18,7 +18,7 @@ # along with this program. If not, see . PKG="byobu" -VERSION=4.14 +VERSION=4.15 [ -z "$BYOBU_PREFIX" ] && export BYOBU_PREFIX="/usr" export BYOBU_PREFIX [ -r "/etc/$PKG/socketdir" ] && . "/etc/$PKG/socketdir" || SOCKETDIR="/var/run/screen"