test -h is deprecated; use -L instead.

PR:             bin/40846

etc/rc.d/bootconf.sh

@@ -15,7 +15,7 @@ bootconf_start()
 	if [ ! -e /etc/etc.current ]; then
 		return 0
 	fi
-	if [ -h /etc/etc.default ]; then
+	if [ -L /etc/etc.default ]; then
 		def=`ls -ld /etc/etc.default 2>&1`
 		default="${def##*-> etc.}"
 	else

etc/rc.d/diskless

@@ -103,7 +103,7 @@ fi
 # XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
-if [ ! -h /tmp ]; then
+if [ ! -L /tmp ]; then
 	mount_md ${tmpsize:=64m} /tmp 2
 	chmod 01777 /tmp
 fi

etc/rc.d/resolv

@@ -103,7 +103,7 @@ fi
 # XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
-if [ ! -h /tmp ]; then
+if [ ! -L /tmp ]; then
 	mount_md ${tmpsize:=64m} /tmp 2
 	chmod 01777 /tmp
 fi

etc/rc.d/syslogd

@@ -37,7 +37,7 @@ syslogd_precmd()
 {
 	#	Transitional symlink for old binaries
 	#
-	if [ ! -h /dev/log ]; then
+	if [ ! -L /dev/log ]; then
 		ln -sf /var/run/log /dev/log
 	fi
 	rm -f /var/run/log

etc/rc.d/tmp

@@ -103,7 +103,7 @@ fi
 # XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
-if [ ! -h /tmp ]; then
+if [ ! -L /tmp ]; then
 	mount_md ${tmpsize:=64m} /tmp 2
 	chmod 01777 /tmp
 fi

etc/rc.d/var

@@ -103,7 +103,7 @@ fi
 # XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
-if [ ! -h /tmp ]; then
+if [ ! -L /tmp ]; then
 	mount_md ${tmpsize:=64m} /tmp 2
 	chmod 01777 /tmp
 fi

etc/rc.diskless2

@@ -94,7 +94,7 @@ fi
 # XXX: mtree runs too early to create any directories needed in /tmp,
 # so if /var/tmp == /tmp, then you don't get a vi.recover.
 #
-if [ ! -h /tmp ]; then
+if [ ! -L /tmp ]; then
 	mount_md ${tmpsize:=64m} /tmp 2
 	chmod 01777 /tmp
 fi

include/Makefile

@@ -84,7 +84,7 @@ INCSLINKS+=	posix4/$i ${INCLUDEDIR}/$i
 
 copies:
 .for i in ${LDIRS} ${LSYMSUBDIRS} machine
-	if [ -h ${DESTDIR}/usr/include/$i ]; then \
+	if [ -L ${DESTDIR}/usr/include/$i ]; then \
 		rm -f ${DESTDIR}/usr/include/$i; \
 	fi
 .endfor

share/examples/Makefile

@@ -262,7 +262,7 @@ beforeinstall: ${SHARED} etc-examples
 
 copies:
 .for i in ${LDIRS}
-	if [ -h ${DESTDIR}${BINDIR}/$i ]; then \
+	if [ -L ${DESTDIR}${BINDIR}/$i ]; then \
 		rm -f ${DESTDIR}${BINDIR}/$i; \
 	fi
 .endfor

tools/tools/upgrade/move_aout_libs.sh

@@ -88,7 +88,7 @@ move_if_aout ( )
 	do
 		# Don't touch symbolic links yet. It's not clear how
 		# they should be handled.
-		if test -h $file; then
+		if test -L $file; then
 		else
 			# Check that this is a normal file.
 			if test -f $file; then