* usr/lib/byobu/.shutil: LP: #844994

- the wget --timeout=1 was not working as desired, without the --tries=1
    option too; so local boots of ubuntu ec2 images that don't have a
    working metadata service might take several minutes for byobu to start
    while that wget tries repeatedly to reach the metadata service;
    big thanks to Ben Howard for helping triage and fix ;-)
This commit is contained in:
Dustin Kirkland 2011-09-08 11:00:20 -07:00
commit 788111f2ef
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View file

@ -5,6 +5,12 @@ byobu (4.33) unreleased; urgency=low
- save a fork
- fix detection of updates, which only worked when there were security
updates
* usr/lib/byobu/.shutil: LP: #844994
- the wget --timeout=1 was not working as desired, without the --tries=1
option too; so local boots of ubuntu ec2 images that don't have a
working metadata service might take several minutes for byobu to start
while that wget tries repeatedly to reach the metadata service;
big thanks to Ben Howard for helping triage and fix ;-)
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 26 Aug 2011 19:07:32 -0500

View file

@ -207,7 +207,7 @@ metadata_available() {
# if a metadata service is available, that does NOT slow down non-ec2
# machines.
if [ -e /etc/ec2_version ] || [ -e /usr/sbin/update-grub-legacy-ec2 ]; then
wget -q -O- --timeout=1 http://169.254.169.254 >/dev/null 2>&1
wget -q -O- --timeout=1 --tries=1 http://169.254.169.254 >/dev/null 2>&1
else
false
fi