* usr/lib/byobu/.shutil:

- update ec2 detection method
This commit is contained in:
Dustin Kirkland 2011-06-30 23:35:46 +00:00
commit 8d8bb000c0
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View file

@ -25,6 +25,8 @@ byobu (4.18) unreleased; urgency=low
* debian/control: start suggesting tmux * debian/control: start suggesting tmux
* usr/bin/byobu, usr/lib/byobu/.constants: * usr/bin/byobu, usr/lib/byobu/.constants:
- support tmux -V version - support tmux -V version
* usr/lib/byobu/.shutil:
- update ec2 detection method
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 29 Jun 2011 02:26:28 +0000 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 29 Jun 2011 02:26:28 +0000

View file

@ -108,7 +108,7 @@ metadata_available() {
# This is really ugly. We need a reliable, fast way of determining # This is really ugly. We need a reliable, fast way of determining
# if a metadata service is available, that does NOT slow down non-ec2 # if a metadata service is available, that does NOT slow down non-ec2
# machines. # machines.
if grep -qs "^domain ec2.internal" /etc/resolv.conf; then if [ -e /etc/ec2_version ]; then
wget -q -O- --timeout=1 http://169.254.169.254 >/dev/null 2>&1 wget -q -O- --timeout=1 http://169.254.169.254 >/dev/null 2>&1
else else
false false