From 05d90511cf2a70c2b09a0cfa96bfee93c20d838c Mon Sep 17 00:00:00 2001
From: mtm <mtm@FreeBSD.org>
Date: Thu, 22 Jan 2004 08:46:03 +0000
Subject: Since id(1) is in /usr, it may not be available until after
 filesystem mounting.

Reminded by: bde
---
 etc/rc.subr | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/rc.subr b/etc/rc.subr
index 5d2c96a..aa78538 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -47,6 +47,8 @@ SYSCTL="/sbin/sysctl"
 SYSCTL_N="${SYSCTL} -n"
 CMD_OSTYPE="${SYSCTL_N} kern.ostype"
 OSTYPE=`${CMD_OSTYPE}`
+ID="/usr/bin/id"
+IDCMD="if [ -x $ID ]; then $ID -un; fi"
 
 case ${OSTYPE} in
 FreeBSD)
@@ -504,7 +506,7 @@ run_rc_command()
 	    _group=\$${name}_group	_groups=\$${name}_groups
 
 	if [ -n "$_user" ]; then	# unset $_user if running as that user
-		if [ "$_user" = "$(id -un)" ]; then
+		if [ "$_user" = "$(eval $IDCMD)" ]; then
 			unset _user
 		fi
 	fi
-- 
cgit v1.1