system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 02:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

if a jail fails to start, don't add its jid to /var/run and print a message with the error.

Browse source 
PR:	conf/97024
MFC after:	1 week
This commit is contained in:
Matteo Riondato 2006-05-09 17:50:16 +00:00
parent b42bfe1947
commit 8cf29c0839
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=158379
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
etc/rc.d/jail
View file

@ -221,11 +221,16 @@ jail_start()
_tmp_jail=${_tmp_dir}/jail.$$
eval jail ${jail_flags} -i ${jail_rootdir} ${jail_hostname} \
${jail_ip} ${jail_exec_start} > ${_tmp_jail} 2>&1
[ "$?" -eq 0 ] && echo -n " $jail_hostname"
_jail_id=$(head -1 ${_tmp_jail})
tail +2 ${_tmp_jail} >${jail_rootdir}/var/log/console.log
if [ "$?" -eq 0 ] ; then
echo -n " $jail_hostname"
_jail_id=$(head -1 ${_tmp_jail})
tail +2 ${_tmp_jail} >${jail_rootdir}/var/log/console.log
echo ${_jail_id} > /var/run/jail_${_jail}.id
else
echo " cannot start jail \"${_jail}\": "
tail +2 ${_tmp_jail}
fi
rm -f ${_tmp_jail}
echo ${_jail_id} > /var/run/jail_${_jail}.id
done
rmdir ${_tmp_dir}
echo '.'
@ -255,7 +260,7 @@ jail_stop()
fi
rm /var/run/jail_${_jail}.id
else
echo "cannot stop jail ${_jail}. No jail id in /var/run"
echo " cannot stop jail ${_jail}. No jail id in /var/run"
fi
done
echo '.'