3 files changed, 1 insertions, 23 deletions
diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index fa6bdb7f34e0..75c715a0132b 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -66,7 +66,7 @@ cbsdd_prestart() {
 	%%PREFIX%%/bin/cbsd netinv
 	update_netinfo
 	env sqlcolnames="1" ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT * FROM local" > ${inventory}
-
+	${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET status='0' WHERE status='3'"
 	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
 	/usr/sbin/daemon -f ${rcddir}/jails-astart start
 }
diff --git a/sysutils/cbsd/files/patch-jailctl-bsetup-tui b/sysutils/cbsd/files/patch-jailctl-bsetup-tui
deleted file mode 100644
index 8fd22fb061d9..000000000000
--- a/sysutils/cbsd/files/patch-jailctl-bsetup-tui
+++ /dev/null
@@ -1,11 +0,0 @@
---- jailctl/bsetup-tui.orig	2016-11-28 11:22:21 UTC
-+++ jailctl/bsetup-tui
-@@ -54,7 +54,7 @@ commit()
- 		fi
- 
- 		[ "${VAL}" = "${OVAL}" ] && continue
--		bset mode=quiet jname=${_oldjname} $i=\"${VAL}\"
-+		bset mode=quiet jname=${_oldjname} $i="${VAL}"
- 	done
- 
- 	[ "${_oldjname}" != "${_newjname}" -a -n "${_newjname}" ] && cbsd brename old=${_oldjname} new=${_newjname}
diff --git a/sysutils/cbsd/files/patch-jailctl-jsetup-tui b/sysutils/cbsd/files/patch-jailctl-jsetup-tui
deleted file mode 100644
index c46921b3dbc5..000000000000
--- a/sysutils/cbsd/files/patch-jailctl-jsetup-tui
+++ /dev/null
@@ -1,11 +0,0 @@
---- jailctl/jsetup-tui.orig	2016-11-28 11:22:21 UTC
-+++ jailctl/jsetup-tui
-@@ -34,7 +34,7 @@ commit()
- 		fi
- 		[ "${VAL}" = "${OVAL}" ] && continue
- 		echo "jset mode=quiet jname=${_oldjname} $i=\"${VAL}\""
--		jset mode=quiet jname=${_oldjname} $i=\"${VAL}\"
-+		jset mode=quiet jname=${_oldjname} $i="${VAL}"
- 	done
- 
- 	if [ "${_oldjname}" != "${_newjname}" -a -n "${_newjname}" ]; then