diff options
author | Philipp Wuensche <cryx-freebsd@h3q.com> | 2014-08-04 14:11:39 +0200 |
---|---|---|
committer | Philipp Wuensche <cryx-freebsd@h3q.com> | 2014-08-04 14:11:39 +0200 |
commit | e496f1aec590a696715f7934aed060f23862ba1e (patch) | |
tree | fc10ad9ffff4f6aa8a5cb3bd5933ee299457b046 /ezjail-admin | |
parent | e08fc24c3833ce247ab5ae575dfe833245377bce (diff) |
Fix bug in the date-string creation reported by kaltheat.
Diffstat (limited to 'ezjail-admin')
-rwxr-xr-x | ezjail-admin | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ezjail-admin b/ezjail-admin index f79082d..86ff736 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -274,7 +274,7 @@ ezjail_splitworld() { | |||
274 | if [ "${ezjail_use_zfs}" = "YES" ]; then | 274 | if [ "${ezjail_use_zfs}" = "YES" ]; then |
275 | ensure_jailzfs | 275 | ensure_jailzfs |
276 | /sbin/zfs create ${ezjail_jailzfs}/basejail | 276 | /sbin/zfs create ${ezjail_jailzfs}/basejail |
277 | /sbin/zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` | 277 | /sbin/zfs snapshot ${ezjail_jailzfs}/basejail@`date +"%C%y%m%d_%H:%M:%S"` |
278 | fi | 278 | fi |
279 | 279 | ||
280 | # Remove schg flags from old basejail binaries. The flags | 280 | # Remove schg flags from old basejail binaries. The flags |
@@ -1003,8 +1003,8 @@ setup|update) | |||
1003 | # If ran from cron be kind to freebsds update servers and sleep first | 1003 | # If ran from cron be kind to freebsds update servers and sleep first |
1004 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" | 1004 | [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch" |
1005 | if [ "${ezjail_use_zfs}" = "YES" ]; then | 1005 | if [ "${ezjail_use_zfs}" = "YES" ]; then |
1006 | zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` | 1006 | zfs snapshot ${ezjail_jailzfs}/basejail@`date +"%C%y%m%d_%H:%M:%S"` |
1007 | zfs snapshot ${ezjail_jailzfs}/newjail@`date -v -7d +"%C%y%m%d_%H:%M:%S"` | 1007 | zfs snapshot ${ezjail_jailzfs}/newjail@`date +"%C%y%m%d_%H:%M:%S"` |
1008 | fi | 1008 | fi |
1009 | env PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install | 1009 | env PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install |
1010 | env PAGER=/bin/cat freebsd-update -b ${ezjail_jailtemplate} ${ezjail_urgency} install | 1010 | env PAGER=/bin/cat freebsd-update -b ${ezjail_jailtemplate} ${ezjail_urgency} install |