summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjamie <jamie@FreeBSD.org>2016-04-23 16:23:01 +0000
committerjamie <jamie@FreeBSD.org>2016-04-23 16:23:01 +0000
commitf5682fb1b923db3173e65dced9d5bbca4be2774c (patch)
tree4f86b09f828c2ac3afdba92bc7b83f9c8f154921 /etc
parent96447551d7fdb195a9f47300089f20aaf82604a7 (diff)
downloadFreeBSD-src-f5682fb1b923db3173e65dced9d5bbca4be2774c.zip
FreeBSD-src-f5682fb1b923db3173e65dced9d5bbca4be2774c.tar.gz
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 MFC after: 5 days
Diffstat (limited to 'etc')
-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 5e2c66a..a42e450 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -489,7 +489,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
@@ -513,7 +512,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