2 files changed, 11 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 1ca70fe..f24da45 100755
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ install:
         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
-        sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.conf.5 > ${DST}/man/man5/ezjail.conf.5
-        sed s:EZJAIL_PREFIX:${PREFIX}: man7/ezjail.7 > ${DST}/man/man7/ezjail.7
+        sed s:EZJAIL_PREFIX:${PREFIX}: man8/ezjail-admin.8 > ${DST}/share/man/man8/ezjail-admin.8
+        sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.conf.5 > ${DST}/share/man/man5/ezjail.conf.5
+        sed s:EZJAIL_PREFIX:${PREFIX}: man7/ezjail.7 > ${DST}/share/man/man7/ezjail.7
         chmod 755 ${DST}/etc/rc.d/ezjail ${DST}/bin/ezjail-admin
         chmod 0440 ${DST}/share/examples/ezjail/example/usr/local/etc/sudoers
diff --git a/ezjail-admin b/ezjail-admin
index 3a6c5a4..4fac8cf 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -31,6 +31,7 @@ ezjail_snap_date_format="%Y%m%d%H%M"
 : ${ezjail_procfs_enable="YES"}
 : ${ezjail_fdescfs_enable="YES"}
 : ${ezjail_exec_start="/bin/sh /etc/rc"}
+: ${ezjail_exec_stop="/bin/sh /etc/rc.shutdown"}
 
 : ${ezjail_use_zfs="NO"}
 
@@ -335,7 +336,7 @@ ezjail_queryftpserver () {
   unset _ret
   echo -n "Querying your ftp-server... "
   TIFS=${IFS}; IFS=
-  for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshot pub/FreeBSD releases snapshots pub/FreeBSD-Archive/old-releases NO; do
+  for ezjail_path in pub/FreeBSD/releases pub/FreeBSD/snapshots pub/FreeBSD releases snapshots pub/FreeBSD-Archive/old-releases NO; do
     if [ ${ezjail_path} = "NO" ]; then
       echo "Warning: I am having problems querying the ftp server you specified (${ezjail_disturi})."
       _ret=1; break
@@ -463,7 +464,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
@@ -1008,8 +1009,10 @@ setup|update)
         zfs snapshot ${ezjail_jailzfs}/basejail@`date +"%C%y%m%d_%H:%M:%S"`
         zfs snapshot ${ezjail_jailzfs}/newjail@`date +"%C%y%m%d_%H:%M:%S"`
     fi
-    env PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install
-    env PAGER=/bin/cat freebsd-update -b ${ezjail_jailtemplate} ${ezjail_urgency} install
+
+    UNAME_r=$( "${ezjail_jailbase}"/bin/freebsd-version -u )
+    env PAGER=/bin/cat freebsd-update -b ${ezjail_jailbase} --currently-running ${UNAME_r} ${ezjail_urgency} install
+    env PAGER=/bin/cat freebsd-update -b ${ezjail_jailtemplate} ${ezjail_urgency} --currently-running ${UNAME_r} install
   elif [ "${ezjail_installaction}" = "freebsd-upgrade" ]; then
     [ -d "${ezjail_jailbase}" ] || exerr "Error: base jail does not exist.\n  You cannot update a base jail until it is created.\n  Please run '${ezjail_admin} update' or '${ezjail_admin} install' first."
 
@@ -1053,7 +1056,7 @@ setup|update)
 
     # make and setup our world, then split basejail and newjail
     cd "${ezjail_sourcetree}" && env DESTDIR="${ezjail_jailfull}" make ${ezjail_installaction} || exerr "Error: The command 'make ${ezjail_installaction}' failed.\n  Refer to the error report(s) above."
-    cd "${ezjail_sourcetree}/etc" && env DESTDIR="${ezjail_jailfull}" make distribution || exerr "Error: The command 'make distribution' failed.\n  Refer to the error report(s) above."
+    cd "${ezjail_sourcetree}" && env DESTDIR="${ezjail_jailfull}" make distribution || exerr "Error: The command 'make distribution' failed.\n  Refer to the error report(s) above."
     ezjail_splitworld
 
   fi # installaction="none"