* usr/bin/byobu-janitor, usr/share/byobu/status/status:

- proper fix for ec2 by default in cloud instances
This commit is contained in:
Dustin Kirkland 2011-09-20 12:20:11 -05:00
commit 3f24ebbb22
3 changed files with 4 additions and 6 deletions

2
debian/changelog vendored
View file

@ -7,6 +7,8 @@ byobu (4.34) unreleased; urgency=low
[ Dustin Kirkland ]
* usr/lib/byobu/.shutil: LP: #854262
- fix regressed monochrome support
* usr/bin/byobu-janitor, usr/share/byobu/status/status:
- proper fix for ec2 by default in cloud instances
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 08 Sep 2011 14:26:43 -0700

View file

@ -59,10 +59,6 @@ for f in status statusrc; do
if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then
# Copy from skeleton, if possible
cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f"
if [ "$f" = "status" ] && metadata_available; then
# Enable ec2_cost if we're in ec2
$SED -i -e "s/ec2_cost=.*/ec2_cost=1/" "$BYOBU_CONFIG_DIR/$f"
fi
fi
done

View file

@ -26,8 +26,8 @@
screen_upper_left="color"
screen_upper_right="color whoami hostname ip_address menu"
screen_lower_left="color logo release #arch"
screen_lower_right="color network #disk_io custom raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #time_utc date time"
screen_lower_right="color network #disk_io custom raid reboot_required updates_available #apport #services #mail users uptime ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #time_utc date time"
# Tmux has one status line, with 2 halves for status
tmux_left="logo release #arch"
tmux_right="network #disk_io custom raid reboot_required updates_available #apport #services #mail users uptime #ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname #ip_address #time_utc date time"
tmux_right="network #disk_io custom raid reboot_required updates_available #apport #services #mail users uptime ec2_cost #rcs_cost #fan_speed #cpu_temp battery wifi_quality #processes load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname #ip_address #time_utc date time"