tweaks

msimerson · Nov 12, 2024 · baf8e20 · baf8e20
1 parent 2b04c7e
commit baf8e20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mail-toaster.sh b/mail-toaster.sh
@@ -355,7 +355,7 @@ jail_conf_header()
 {
 	local _path="$ZFS_JAIL_MNT/\$name"
 	if [ "$1" = "base" ]; then
-		_path="$ZFS_JAIL_MNT/$(uname -r | cut -f1,2 -d'-')"
+		_path="base-$ZFS_JAIL_MNT/$(uname -r | cut -f1,2 -d'-')"
 	fi
 
 	cat <<EO_JAIL_CONF_HEAD

diff --git a/provision/host.sh b/provision/host.sh
@@ -67,7 +67,7 @@ disable_ntpd()
 {
 	if grep -q ^ntpd_enable /etc/rc.conf; then
 		tell_status "disabling NTPd"
-		service ntpd onestop
+		service ntpd onestop || echo -n
 		sysrc ntpd_enable=NO
 	fi