Make it explicit that you need to login to "users" to clean up an over-quota

condition.

account/quotamail.in

@@ -39,11 +39,16 @@ You can check your usage with the 'quota' command on @USERNODE@:
 
 (Note: This will not work from nodes in an experiment.)
 
-The directory trees where you most likely have files are:
+The directory trees (on @USERNODE@) where you most likely have files are:
+
 Project directory:    @FSDIR_PROJ@
 Group directory:      @FSDIR_GROUPS@
 User/Home directory:  @FSDIR_USERS@   
 
+PLEASE NOTE: just login to @USERNODE@ directly to do the cleanup!
+You will not be able to swapin an experiment to access these directories
+while over quota.
+
 Thanks,
 @THISHOMEBASE@ Testbed Operations
 @TBOPSEMAIL_NOSLASH@

tbsetup/batchexp.in

@@ -184,7 +184,8 @@ if (! UserDBInfo($dbuid, \$user_name, \$user_email)) {
 if (system("$checkquota $dbuid") != 0) {
     tberror({cause => 'user', type => 'primary', severity => SEV_ERROR,
 	     error => ['over_disk_quota', $CONTROL]},
-	    "You are over your disk quota on $CONTROL; please cleanup!");
+	    "You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

tbsetup/swapexp.in

@@ -347,7 +347,8 @@ my $overquota = system("$checkquota $dbuid");
 if ($overquota) {
     tberror({cause => 'user', severity => SEV_WARNING,
 	     error => ['over_disk_quota', $CONTROL]},
-	    "You are over your disk quota on $CONTROL; please cleanup!");
+	    "You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
 }
 
 #

tbsetup/template_analyze.in

@@ -140,7 +140,8 @@ if ($instance->ArchiveTag(\$archive_tag) < 0) {
 }
 
 if (system("$checkquota $dbuid") != 0) {
-    tberror("You are over your disk quota on $CONTROL; please cleanup!");
+    tberror("You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

tbsetup/template_create.in

@@ -141,7 +141,8 @@ if (! UserDBInfo($dbuid, \$user_name, \$user_email)) {
 # our time. Make sure user sees the error by exiting with 1.
 #
 if (system("$checkquota $dbuid") != 0) {
-    tberror("You are over your disk quota on $CONTROL; please cleanup!");
+    tberror("You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

tbsetup/template_export.in

@@ -144,7 +144,8 @@ if ($instance->ArchiveTag(\$archive_tag) < 0) {
 }
 
 if (system("$checkquota $dbuid") != 0) {
-    tberror("You are over your disk quota on $CONTROL; please cleanup!");
+    tberror("You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

tbsetup/template_exprun.in

@@ -162,7 +162,8 @@ if (! UserDBInfo($dbuid, \$user_name, \$user_email)) {
 # our time. Make sure user sees the error by exiting with 1.
 #
 if (system("$checkquota $dbuid") != 0) {
-    tberror("You are over your disk quota on $CONTROL; please cleanup!");
+    tberror("You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

tbsetup/template_instantiate.in

@@ -163,7 +163,8 @@ if (! UserDBInfo($dbuid, \$user_name, \$user_email)) {
 # our time. Make sure user sees the error by exiting with 1.
 #
 if (system("$checkquota $dbuid") != 0) {
-    tberror("You are over your disk quota on $CONTROL; please cleanup!");
+    tberror("You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

tbsetup/template_linkgraph.in

@@ -147,7 +147,8 @@ if ($instance->ArchiveTag(\$archive_tag) < 0) {
 }
 
 if (system("$checkquota $dbuid") != 0) {
-    tberror("You are over your disk quota on $CONTROL; please cleanup!");
+    tberror("You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

tbsetup/template_swapin.in

@@ -163,7 +163,8 @@ if (! UserDBInfo($dbuid, \$user_name, \$user_email)) {
 # our time. Make sure user sees the error by exiting with 1.
 #
 if (system("$checkquota $dbuid") != 0) {
-    tberror("You are over your disk quota on $CONTROL; please cleanup!");
+    tberror("You are over your disk quota on $CONTROL; ".
+	    "please login there and cleanup!");
     exit(1);
 }
 

utils/create_image.in

@@ -185,7 +185,8 @@ if ($UID && !TBAdmin($UID)) {
 #
 if (system("$checkquota $dbuid") != 0) {
     die("*** $0:\n".
-	"    You are over your disk quota on $CONTROL; please cleanup!\n");
+	"    You are over your disk quota on $CONTROL; ".
+	"please login there and cleanup!\n");
 }
 
 #