summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2013-05-01 18:38:18 +0000
committererdgeist <erdgeist@erdgeist.org>2013-05-01 18:38:18 +0000
commit0713769a1941de549aa64bfda30dac73449f1519 (patch)
treee21eec04d467a3549ac5ab76d917c380d19fd616
parent68253cc7a57cf4e7e94e9646ffc0f14f1bf9ac7d (diff)
Fix error report by passing echo the -n parameter. Thanks to 乃村翼
-rwxr-xr-xezjail-admin4
-rwxr-xr-xezjail.conf.sample3
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)
1311 if [ "${ezjail_imagetype}" -a "${ezjail_imagetype}" != "zfs" -a -z "${ezjail_attached}" ]; then 1311 if [ "${ezjail_imagetype}" -a "${ezjail_imagetype}" != "zfs" -a -z "${ezjail_attached}" ]; then
1312 if [ "${ezjail_attachblocking}" ]; then 1312 if [ "${ezjail_attachblocking}" ]; then
1313 echo "Warning: Jail ${ezjail_name} is an image jail and can not be attached automatically." 1313 echo "Warning: Jail ${ezjail_name} is an image jail and can not be attached automatically."
1314 echo " Use '${ezjail_admin} config -i attach ${ezjail_name}' to attach it first." 1314 echo " Use '${ezjail_admin} config -i attach ${ezjail_name}' to attach it first."
1315 continue 1315 continue
1316 fi 1316 fi
1317 mount_images 1317 mount_images
@@ -1361,7 +1361,7 @@ archive)
1361 [ "${ezjail_imagesize}" ] && detach_images keep 1361 [ "${ezjail_imagesize}" ] && detach_images keep
1362 1362
1363 # An error on a jail not running is bad 1363 # An error on a jail not running is bad
1364 [ ${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}." 1364 [ ${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}."
1365 1365
1366 # When archiving a running jail, some errors might occur 1366 # When archiving a running jail, some errors might occur
1367 [ ${ezjail_paxresult} -eq 0 ] || echo "Warning: Archiving jail ${ezjail_name} was not completely successful. For a running jail this is not unusual." 1367 [ ${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 @@
64# For auto snapshots this is the default policy to keep old snapshots. In each window there 64# For auto snapshots this is the default policy to keep old snapshots. In each window there
65# will be guaranteed to be one or two snapshots only 65# will be guaranteed to be one or two snapshots only
66# If this variable is not set, no snapshots will be removed by ezjail-admin snapshot 66# If this variable is not set, no snapshots will be removed by ezjail-admin snapshot
67
68# Example policy for a database jail with rollbackable snapshots with at least four snapshots
69# in the last hour. Beware of the load caused by destroying snapshots.
67# ezjail_default_retention_policy="4x15m 3x1h 2x2h 4h 12h 6x1d 7x1w 11x4w 1000x1y" 70# ezjail_default_retention_policy="4x15m 3x1h 2x2h 4h 12h 6x1d 7x1w 11x4w 1000x1y"