From c000ebba48648018eee225ea08785f02ff4cc5cc Mon Sep 17 00:00:00 2001
From: Andrew Kesterson <andrew@aklabs.net>
Date: Thu, 23 Aug 2012 18:59:44 -0400
Subject: [PATCH] Midstream, this may destroy the world

---
 balls/entities/files/usr/sbin/disco-linux-ents | 6 ++++--
 balls/users/requires                           | 3 ++-
 universe/bin/disco-ball                        | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/balls/entities/files/usr/sbin/disco-linux-ents b/balls/entities/files/usr/sbin/disco-linux-ents
index 9ee4b13..de183d7 100644
--- a/balls/entities/files/usr/sbin/disco-linux-ents
+++ b/balls/entities/files/usr/sbin/disco-linux-ents
@@ -22,8 +22,10 @@ fi
 NAME="$2"
 op="$3"
 
-PARAMS=$(disco-param get ${HOSTNAME}/users/${op}/${NAME})
-getent ${GETENT} | grep "^${NAME}" 2>&1 | disco-shutup
+set -x
+
+PARAMS=$(disco-param get ${HOSTNAME}/${GETENT}s/${op}/${NAME})
+BLAH=$(getent ${GETENT} | grep "^${NAME}" 2>&1)
 RETVAL=$?
 if [ $RETVAL -eq 0 ] && [ "$op" == "absent" ]; then
     ${DEL} ${NAME}
diff --git a/balls/users/requires b/balls/users/requires
index a514245..65a2e2e 100644
--- a/balls/users/requires
+++ b/balls/users/requires
@@ -1 +1,2 @@
-disco-linux-ents
\ No newline at end of file
+entities
+groups
diff --git a/universe/bin/disco-ball b/universe/bin/disco-ball
index b76d498..3f9aa90 100755
--- a/universe/bin/disco-ball
+++ b/universe/bin/disco-ball
@@ -130,6 +130,11 @@ function spin() {
     if [ "$NOOP" == "" ]; then
 	# Now for the real rsync back home
 	rsync -aWH /var/disco/testfs/real/scratchfs/. /
+	cd /var/disco/testfs/real/scratchfs/.unionfs
+	for file in $(find . -iname "_HIDDEN~" -type f); 
+	do 
+	    rm -rf /${file}
+	done
     fi
     rm -rf /var/disco/testfs/noop/scratchfs/*
     rm -rf /var/disco/testfs/real/scratchfs/*