svn commit: r230403 - head/etc/rc.d

[Brooks Davis]

Author: brooks
Date: Fri Jan 20 22:55:19 2012
New Revision: 230403
URL: http://svn.freebsd.org/changeset/base/230403

Log:
  When creating the jails /dev/log symlink, do it by full path to avoid
  creating stray "log" symlinks if the mount fails.  That apparently
  happens in some ezjail configs.
  
  PR:		conf/143084
  Submitted by:	Dirk Engling <erdgeist at erdgeist.org>
  Reviewed by:	simon
  MFC after:	2 weeks

Modified:
  head/etc/rc.d/jail

Modified: head/etc/rc.d/jail
==============================================================================
--- head/etc/rc.d/jail	Fri Jan 20 22:55:16 2012	(r230402)
+++ head/etc/rc.d/jail	Fri Jan 20 22:55:19 2012	(r230403)
@@ -601,10 +601,7 @@ jail_start()
 				devfs_mount_jail "${_devdir}" ${_ruleset}
 				# Transitional symlink for old binaries
 				if [ ! -L "${_devdir}/log" ]; then
-					__pwd="`pwd`"
-					cd "${_devdir}"
-					ln -sf ../var/run/log log
-					cd "$__pwd"
+					ln -sf ../var/run/log "${_devdir}/log"
 				fi
 			fi