From 788111f2ef41110e931c66a7f1bfbd0c8b3cf4f6 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Thu, 8 Sep 2011 11:00:20 -0700 Subject: [PATCH] * 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 ;-) --- debian/changelog | 6 ++++++ usr/lib/byobu/.shutil | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8976bec8..eaf18b01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 26 Aug 2011 19:07:32 -0500 diff --git a/usr/lib/byobu/.shutil b/usr/lib/byobu/.shutil index c7b5f541..fcf5953f 100755 --- a/usr/lib/byobu/.shutil +++ b/usr/lib/byobu/.shutil @@ -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