summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamie <jamie@FreeBSD.org>2016-04-28 01:31:07 +0000
committerjamie <jamie@FreeBSD.org>2016-04-28 01:31:07 +0000
commit896a089c370469825d994ffeab54ba839f635ce9 (patch)
tree7235eadc2ea0891e3a228909350a0d40b3ce19f7
parent4d78336c424ca941ccdd2ead90e8e2beec434429 (diff)
downloadFreeBSD-src-896a089c370469825d994ffeab54ba839f635ce9.zip
FreeBSD-src-896a089c370469825d994ffeab54ba839f635ce9.tar.gz
MFC r298516:
Don't remove the /var/run/jail_name.id file if a jail fails to start. This messes up ezjail (and possibly others), when attempting to start a jail that already exists. PR: 208806 Reviewed by: tj
-rwxr-xr-xetc/rc.d/jail2
1 files changed, 0 insertions, 2 deletions
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index dfa301b..b2fd452 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -471,7 +471,6 @@ jail_start()
if _jid=$($jail_jls -j $_j jid); then
echo "$_jid" > /var/run/jail_${_j}.id
else
- rm -f /var/run/jail_${_j}.id
echo " cannot start jail " \
"\"${_hostname:-${_j}}\": "
fi
@@ -495,7 +494,6 @@ jail_start()
_jid=$($jail_jls -j $_j jid)
echo $_jid > /var/run/jail_${_j}.id
else
- rm -f /var/run/jail_${_j}.id
echo " cannot start jail " \
"\"${_hostname:-${_j}}\": "
cat $_tmp
OpenPOWER on IntegriCloud