From 0713769a1941de549aa64bfda30dac73449f1519 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 1 May 2013 18:38:18 +0000
Subject: =?UTF-8?q?Fix=20error=20report=20by=20passing=20echo=20the=20-n?=
 =?UTF-8?q?=20parameter.=20Thanks=20to=20=E4=B9=83=E6=9D=91=E7=BF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ezjail-admin       | 4 ++--
 ezjail.conf.sample | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ezjail-admin b/ezjail-admin
index 099af05..0f7dd1e 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1311,7 +1311,7 @@ archive)
     if [ "${ezjail_imagetype}" -a "${ezjail_imagetype}" != "zfs" -a -z "${ezjail_attached}" ]; then
       if [ "${ezjail_attachblocking}" ]; then
         echo "Warning: Jail ${ezjail_name} is an image jail and can not be attached automatically."
-        echo "         Use '${ezjail_admin} config -i attach ${ezjail_name}' to attach it first."
+        echo "  Use '${ezjail_admin} config -i attach ${ezjail_name}' to attach it first."
         continue
       fi
       mount_images
@@ -1361,7 +1361,7 @@ archive)
     [ "${ezjail_imagesize}" ] && detach_images keep
 
     # An error on a jail not running is bad
-    [ ${ezjail_paxresult} -eq 0 -o "${ezjail_force}" ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful.\n  Please refer to the output above for problems the archiving tool encountered.\n  You may ignore reports concerning setting access and modification times.\n  You might want to check and remove ${ezjail_archive}."
+    [ ${ezjail_paxresult} -eq 0 -o "${ezjail_force}" ] || echo -n "Warning: Archiving jail ${ezjail_name} was not completely successful.\n  Please refer to the output above for problems the archiving tool encountered.\n  You may ignore reports concerning setting access and modification times.\n  You might want to check and remove ${ezjail_archive}."
 
     # When archiving a running jail, some errors might occur
     [ ${ezjail_paxresult} -eq 0 ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful. For a running jail this is not unusual."
diff --git a/ezjail.conf.sample b/ezjail.conf.sample
index 6ddd066..6cc5657 100755
--- a/ezjail.conf.sample
+++ b/ezjail.conf.sample
@@ -64,4 +64,7 @@
 # For auto snapshots this is the default policy to keep old snapshots. In each window there
 # will be guaranteed to be one or two snapshots only
 # If this variable is not set, no snapshots will be removed by ezjail-admin snapshot
+
+# Example policy for a database jail with rollbackable snapshots with at least four snapshots
+# in the last hour. Beware of the load caused by destroying snapshots.
 # ezjail_default_retention_policy="4x15m 3x1h 2x2h 4h 12h 6x1d 7x1w 11x4w 1000x1y"
-- 
cgit v1.2.3