Makefile

@@ -9,10 +9,10 @@ all:
 
 install:
 	mkdir -p ${DST}/etc/ezjail/ ${DST}/man/man5/ ${DST}/man/man7 ${DST}/man/man8 ${DST}/etc/rc.d/ ${DST}/bin/ ${DST}/share/examples/ezjail ${DST}/share/zsh/site-functions
+	cp ezjail.conf.sample ${DST}/etc/
 	cp -R examples/example ${DST}/share/examples/ezjail/
 	cp -R examples/nullmailer-example ${DST}/share/examples/ezjail/
 	cp -R share/zsh/site-functions/ ${DST}/share/zsh/site-functions/
-	sed s:EZJAIL_PREFIX:${PREFIX}: ezjail.conf.sample > ${DST}/etc/ezjail.conf.sample
 	sed s:EZJAIL_PREFIX:${PREFIX}: ezjail.sh > ${DST}/etc/rc.d/ezjail
 	sed s:EZJAIL_PREFIX:${PREFIX}: ezjail-admin > ${DST}/bin/ezjail-admin
 	sed s:EZJAIL_PREFIX:${PREFIX}: man8/ezjail-admin.8 > ${DST}/man/man8/ezjail-admin.8

ezjail-admin

@@ -463,7 +463,7 @@ filteroldsnapshots() {
     case ${win} in [0-9]);; [0-9]*[0-9mhdwy]);; *) echo "Unknown window length declaration ${win}"; return ;; esac
 
     # values default to minutes
-    case ${win} in *h) m=60;; *d) m=1440;; *w) m=10080;; *y) m=525600;; *) m=1;; esac
+    case ${win} in *h) m=60;; *d) m=1440;; *w) m=10080;; *y) m=*525600;; *) m=1;; esac
     win=$((${win%[mhdwy]}*m*60))
 
     # innerloop $repeats over windows

man7/ezjail.7

@@ -221,7 +221,7 @@ that specifies whether the filesystems in
 are carried out. Set by ezjail to
 .Dq Li YES ,
 set to
-.Dq Li NO
+.Qd Li NO
 at your own risk.
 .It jail_JAILNAME_devfs_enable
 A boolean specifying whether to mount a
@@ -262,7 +262,7 @@ The parameters to pass to the tool used to decrypt file-based,
 encrypted jails. Initialized from the
 .Fl C
 option when creating such a jail, or the empty string.
-.It ezjail_JAILNAME_attachblocking
+.Ir ezjail_JAILNAME_attachblocking
 .Dq Li YES
 if the jail requires interaction with the administrator when starting
 (typically, encrypted jails that needs a password to be decrypted).

man8/ezjail-admin.8

@@ -396,6 +396,7 @@ means that the jail is not automatically started.
 .Pp
 The following columns are the JID (when it is running), the IP addresses, the name and the full path directory name of the jail.
 .Ss Nm Cm start | restart | stop | startcrypto | stopcrypto Op Ar jailname ...
+.Pp
 This is a shortcut to the
 .Xr rc 8
 .Cm ezjail
@@ -423,7 +424,7 @@ The following options are available:
 .Bl -tag -width indent
 .It Fl r Cm run | norun | test
 Set the jail to be automatically started or not on boot.
-.sp
+
 Note that the test parameter can be used to check if an ezjail exists, in this case the script will return with an exit code of zero and the runnable state on standard out. A non-zero exit code will be returned if the jail does not exist.
 .It Fl n Ar newname
 Rename the jail. Unless a custom root directory was given with the
@@ -455,6 +456,7 @@ the selected jail as well as
 The
 .Pa /usr/jails/ Ns Ar jailname
 directory is not deleted.
+.Pp
 .Bl -tag -width indent
 .It Fl f
 Stop the jail before deleting it.