From ea93fb4bd90c6fd1073dd2c7c2bd05b0b1a843dd Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 17 Nov 2004 20:34:25 +0000
Subject: [PATCH] PL2445

Both vcached and vuseradd now print a warning message when vbuild succeeds
but the resulting new vserver image is smaller in size than the
vserver-reference image.
---
 scripts/vcached  | 9 ++++++++-
 scripts/vuseradd | 8 ++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/vcached b/scripts/vcached
index 67ba17f..bb0b212 100755
--- a/scripts/vcached
+++ b/scripts/vcached
@@ -16,7 +16,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vcached,v 1.5 2004/10/12 21:27:15 mlhuang Exp $
+# $Id: vcached,v 1.6 2004/10/13 02:35:47 mlhuang Exp $
 #
 
 # get configuration
@@ -74,6 +74,13 @@ while : ; do
 	    RETVAL=$?
 	    # move it to .vcache when complete
 	    if [ $RETVAL -eq 0 ] ; then
+    	         # sanity check
+		vnewsize=$(du -s "$TMP" | awk "{ print \$1 }")
+		vrefsize=$(du -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }")
+		if [ $vnewsize -lt $vrefsize ] ; then
+		    echo "WARNING: Unexpected for 'du -s $VROOTDIR/$NAME'=$vnewsize to be less than 'du -s $VROOTDIR/vserver-reference'=$vrefsize"
+		fi
+
 		mv "$TMP" "$VROOTDIR/.vcache/v$i"
 		echo "$(date) v$i ready"
 	    else
diff --git a/scripts/vuseradd b/scripts/vuseradd
index af4c467..177466a 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuseradd,v 1.16 2004/11/12 18:44:09 mef Exp $
+# $Id: vuseradd,v 1.17 2004/11/17 19:35:47 mef Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -65,11 +65,7 @@ if [ ! -d "$VROOTDIR/$NAME" ] ; then
 	    vnewsize=$(du -s "$TMP" | awk "{ print \$1 }")
 	    vrefsize=$(du -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }")
 	    if [ $vnewsize -lt $vrefsize ] ; then
-		echo "Error 'du -s $VROOTDIR/$NAME'=$vnewsize < 'du -s $VROOTDIR/vserver-reference'=$vrefsize"
-		chattr -R -i "$TMP"
-		rm -rf "$TMP"
-		userdel $NAME
-		exit 256
+		echo "WARNING: Unexpected for 'du -s $VROOTDIR/$NAME'=$vnewsize to be less than 'du -s $VROOTDIR/vserver-reference'=$vrefsize"
 	    fi
 
 	    mv "$TMP" "$VROOTDIR/$NAME"
-- 
2.43.0