[PC-BSD Commits] r19637 - in pcbsd: branches/9.1/src-sh/warden/scripts/backend current/src-sh/warden/scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2012-10-10 19:18:59 +0000 (Wed, 10 Oct 2012)
New Revision: 19637

Modified:
   pcbsd/branches/9.1/src-sh/warden/scripts/backend/deletejail.sh
   pcbsd/current/src-sh/warden/scripts/backend/deletejail.sh
Log:

Hide a warning if ZFS cleans up the directory itself



Modified: pcbsd/branches/9.1/src-sh/warden/scripts/backend/deletejail.sh
===================================================================
--- pcbsd/branches/9.1/src-sh/warden/scripts/backend/deletejail.sh	2012-10-10 19:03:21 UTC (rev 19636)
+++ pcbsd/branches/9.1/src-sh/warden/scripts/backend/deletejail.sh	2012-10-10 19:18:59 UTC (rev 19637)
@@ -53,7 +53,7 @@
   # Create ZFS mount
   tank=`getZFSTank "$JDIR"`
   zfs destroy -r ${tank}${JDIR}/${IP}
-  rmdir ${JDIR}/${IP}
+  rmdir ${JDIR}/${IP} 2>/dev/null
 else
   chflags -R noschg "${JDIR}/${IP}"
   rm -rf "${JDIR}/${IP}"

Modified: pcbsd/current/src-sh/warden/scripts/backend/deletejail.sh
===================================================================
--- pcbsd/current/src-sh/warden/scripts/backend/deletejail.sh	2012-10-10 19:03:21 UTC (rev 19636)
+++ pcbsd/current/src-sh/warden/scripts/backend/deletejail.sh	2012-10-10 19:18:59 UTC (rev 19637)
@@ -53,7 +53,7 @@
   # Create ZFS mount
   tank=`getZFSTank "$JDIR"`
   zfs destroy -r ${tank}${JDIR}/${IP}
-  rmdir ${JDIR}/${IP}
+  rmdir ${JDIR}/${IP} 2>/dev/null
 else
   chflags -R noschg "${JDIR}/${IP}"
   rm -rf "${JDIR}/${IP}"