Sort out ZFS refquota/quota settings, part 1.

Add defs-* multiplier factor variable for setting "quota" based on "refquota".
For most sites this will just be 1.0. On the mothership, where we use ZFS
snapshots for backup, we are going to start with 2.0.

configure

@@ -3,7 +3,7 @@
 # Generated by GNU Autoconf 2.69.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012, 2016 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -688,6 +688,9 @@ AMD_ROOT
 WITHAMD
 INCREMENTAL_MOUNTD
 ZFS_NOEXPORT
+ZFS_QUOTA_GROUP_X
+ZFS_QUOTA_PROJECT_X
+ZFS_QUOTA_USER_X
 ZFS_QUOTA_GROUP
 ZFS_QUOTA_PROJECT
 ZFS_QUOTA_USER
@@ -5021,6 +5024,9 @@ done
 
 
 
+
+
+
 
 
 
@@ -5182,6 +5188,9 @@ ZFS_ROOT=z
 ZFS_QUOTA_USER="1G"
 ZFS_QUOTA_PROJECT="100G"
 ZFS_QUOTA_GROUP="10G"
+ZFS_QUOTA_USER_X="1.0"
+ZFS_QUOTA_PROJECT_X="1.0"
+ZFS_QUOTA_GROUP_X="1.0"
 ZFS_NOEXPORT=0
 INCREMENTAL_MOUNTD=0
 WITHAMD=0
@@ -5655,23 +5664,22 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 fi
-if test $PROTOGENI_LOCALUSER -eq 1; then
+if test $WITHAMD -eq 1; then
 
 cat >>confdefs.h <<_ACEOF
-#define PROTOGENI_LOCALUSER 1
+#define WITHAMD 1
 _ACEOF
 
-fi
-
-if test $WITHAMD -eq 1; then
 
 cat >>confdefs.h <<_ACEOF
-#define WITHAMD 1
+#define AMD_ROOT "$AMD_ROOT"
 _ACEOF
 
+fi
+if test $PROTOGENI_LOCALUSER -eq 1; then
 
 cat >>confdefs.h <<_ACEOF
-#define AMD_ROOT "$AMD_ROOT"
+#define PROTOGENI_LOCALUSER 1
 _ACEOF
 
 fi
@@ -6882,7 +6890,7 @@ if test -f "tbsetup/snmpit"; then
     /bin/rm -f tbsetup/snmpit
     if test $? -ne 0; then
         as_fn_error $? "Cannot remove old tbsetup/snmpit file" "$LINENO" 5;
-    fi 
+    fi
 fi
 
 #
@@ -6945,7 +6953,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	db/update_permissions \
 	db/grabron db/stategraph db/readycount \
 	db/idletimes db/idlemail db/xmlconvert \
-	db/libdb.py db/elabinelab_bossinit \
+	db/libdb.py db/elabinelab_bossinit db/Reservation.pm \
 	ipod/GNUmakefile \
 	os/GNUmakefile os/split-image.sh \
 	pxe/GNUmakefile pxe/bootinfo.restart \
@@ -7044,7 +7052,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	utils/mkblob utils/rmblob utils/ctrladdr utils/tcppd \
 	utils/mktestbedtest utils/pxelinux_makeconf \
 	utils/addvpubaddr utils/attend utils/atten utils/addrfdevice \
-	utils/addrfpath \
+	utils/addrfpath utils/reserve utils/predict utils/notify-reservations \
+	utils/setzfsquotas \
 	www/GNUmakefile www/defs.php3 www/dbdefs.php3 www/xmlrpc.php3 \
 	www/xmlrpcpipe.php3 \
 	www/swish.conf www/websearch \

configure.ac

@@ -308,6 +308,9 @@ AC_SUBST(ZFS_ROOT)
 AC_SUBST(ZFS_QUOTA_USER)
 AC_SUBST(ZFS_QUOTA_PROJECT)
 AC_SUBST(ZFS_QUOTA_GROUP)
+AC_SUBST(ZFS_QUOTA_USER_X)
+AC_SUBST(ZFS_QUOTA_PROJECT_X)
+AC_SUBST(ZFS_QUOTA_GROUP_X)
 AC_SUBST(ZFS_NOEXPORT)
 AC_SUBST(INCREMENTAL_MOUNTD)
 AC_SUBST(WITHAMD)
@@ -478,6 +481,9 @@ ZFS_ROOT=z
 ZFS_QUOTA_USER="1G"
 ZFS_QUOTA_PROJECT="100G"
 ZFS_QUOTA_GROUP="10G"
+ZFS_QUOTA_USER_X="1.0"
+ZFS_QUOTA_PROJECT_X="1.0"
+ZFS_QUOTA_GROUP_X="1.0"
 ZFS_NOEXPORT=0
 INCREMENTAL_MOUNTD=0
 WITHAMD=0
@@ -1379,6 +1385,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	utils/mktestbedtest utils/pxelinux_makeconf \
 	utils/addvpubaddr utils/attend utils/atten utils/addrfdevice \
 	utils/addrfpath utils/reserve utils/predict utils/notify-reservations \
+	utils/setzfsquotas \
 	www/GNUmakefile www/defs.php3 www/dbdefs.php3 www/xmlrpc.php3 \
 	www/xmlrpcpipe.php3 \
 	www/swish.conf www/websearch \

defs-default

@@ -188,10 +188,14 @@ IMAGEDIRECTORIES=1
 # Per-user/project ZFS.
 WITHZFS=1
 ZFS_ROOT=z
+ZFS_NOEXPORT=1
 ZFS_QUOTA_USER="1G"
 ZFS_QUOTA_PROJECT="100G"
 ZFS_QUOTA_GROUP="5G"
-ZFS_NOEXPORT=1
+# Allow room for backup snapshots
+ZFS_QUOTA_USER_X="2.0"
+ZFS_QUOTA_PROJECT_X="2.0"
+ZFS_QUOTA_GROUP_X="2.0"
 
 # XXX autofs still has some problems, stick with AMD for now
 # WITHZFS only: use AMD instead of autofs for /proj, /users mounts on boss