2 files changed, 13 insertions, 14 deletions
diff --git a/check-hosts b/check-hosts
index ac64741..e629bab 100755
--- a/check-hosts
+++ b/check-hosts
@@ -3,33 +3,32 @@
 STALE_DIR="${HOME}/var/stale/"
 
 get_names() {
-    /usr/sbin/bcfg2-reports "$@" --fields=name | sed 's/ *$//'
+    /usr/sbin/bcfg2-reports clients "$@" --fields=name | sed '/^Name *$/d;s/ *$//'
 }
 
 get_stale() {
-    get_names --stale | sed 's/ *$//'
+    get_names --stale
 }
 
 get_all() {
-    get_names -a | sed 's/ *$//'
+    get_names
 }
 
 get_bad() {
-    get_names -d | sed 's/ *$//'
+    get_names -d
 }
 
 get_clean() {
-    get_names -c | sed 's/ *$//'
+    get_names -c
 }
 
-get_count() {
-    count=$(/usr/sbin/bcfg2-reports "$@" | wc -l)
-
-    if [ "$count" = "0" ]; then
-        echo 0
-    else
-        echo $((count - 1))
-    fi
+get_extra() {
+    /usr/sbin/bcfg2-reports clients --fields=extra,name | sed '1d;s/ *$//' | \
+    while read extra name ; do
+        if [ "$extra" != "0" ]; then
+            echo $name
+        fi
+    done
 }
 
 get_stale_once() {
diff --git a/hosts-state b/hosts-state
index 965955c..c4e228b 100755
--- a/hosts-state
+++ b/hosts-state
@@ -21,7 +21,7 @@ my $summary = {
   status => 0
 };
 
-open(my $reports, '-|', '/usr/sbin/bcfg2-reports', 'clients', '-a', '--fields=state,time,total,good,bad,extra,modified');
+open(my $reports, '-|', '/usr/sbin/bcfg2-reports', 'clients', '--fields=state,time,total,good,bad,extra,modified');
 
 my $header = 1;
 while(<$reports>) {