From owner-svn-src-all@FreeBSD.ORG  Fri Feb 10 15:54:18 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 452BD1065672;
	Fri, 10 Feb 2012 15:54:18 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F19A8FC08;
	Fri, 10 Feb 2012 15:54:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1AFsILR082088;
	Fri, 10 Feb 2012 15:54:18 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1AFsHfh082086;
	Fri, 10 Feb 2012 15:54:17 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201202101554.q1AFsHfh082086@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 10 Feb 2012 15:54:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231388 - stable/9/etc/rc.d
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Feb 2012 15:54:18 -0000

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