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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ezjail-admin')

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."
-- 
cgit v1.2.3