* usr/bin/byobu-janitor, usr/share/byobu/status/status: LP: #856467

- cleaner fix for ensuring ec2_cost is enabled in ec2 instances;
    previous fix just enabled it everywhere
This commit is contained in:
Dustin Kirkland 2011-09-22 11:58:03 -05:00
commit 28d0e6a530
3 changed files with 9 additions and 3 deletions

4
debian/changelog vendored
View file

@ -1,6 +1,8 @@
byobu (4.35) unreleased; urgency=low
* UNRELEASED
* usr/bin/byobu-janitor, usr/share/byobu/status/status: LP: #856467
- cleaner fix for ensuring ec2_cost is enabled in ec2 instances;
previous fix just enabled it everywhere
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 21 Sep 2011 18:49:00 -0500

View file

@ -59,6 +59,10 @@ 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"
# Enable ec2_cost, if we're in ec2 and seeding a new setup
if metadata_available; then
$SED -i -e "s/#ec2_cost/ec2_cost/g" "$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"