svn commit: r231388 - stable/9/etc/rc.d

Brooks Davis brooks at FreeBSD.org
Fri Feb 10 15:54:18 UTC 2012


Author: brooks
Date: Fri Feb 10 15:54:17 2012
New Revision: 231388
URL: http://svn.freebsd.org/changeset/base/231388

Log:
  MFC r230403.
  
  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>

Modified:
  stable/9/etc/rc.d/jail
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/rc.d/jail
==============================================================================
--- stable/9/etc/rc.d/jail	Fri Feb 10 15:34:36 2012	(r231387)
+++ stable/9/etc/rc.d/jail	Fri Feb 10 15:54:17 2012	(r231388)
@@ -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
 


More information about the svn-src-stable-9 mailing list