Index: head/libexec/rc/rc.d/linux
===================================================================
--- head/libexec/rc/rc.d/linux	(revision 354457)
+++ head/libexec/rc/rc.d/linux	(revision 354458)
@@ -1,39 +1,58 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: linux
 # REQUIRE: archdep
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="linux"
 desc="Enable Linux ABI"
 rcvar="linux_enable"
 start_cmd="${name}_start"
 stop_cmd=":"
 
 linux_start()
 {
-	local _tmpdir
+	local _emul_path _tmpdir
 
 	load_kld -e 'linux(aout|elf)' linux
 	case `sysctl -n hw.machine_arch` in
 	amd64)
 		load_kld -e 'linux64elf' linux64
 		;;
 	esac
 	if [ -x /compat/linux/sbin/ldconfigDisabled ]; then
 		_tmpdir=`mktemp -d -t linux-ldconfig`
 		/compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache
 		if ! cmp -s ${_tmpdir}/ld.so.cache /compat/linux/etc/ld.so.cache; then
 			cat ${_tmpdir}/ld.so.cache > /compat/linux/etc/ld.so.cache
 		fi
 		rm -rf ${_tmpdir}
 	fi
+
+	# Linux uses the pre-pts(4) tty naming scheme.
+	load_kld pty
+
+	# Handle unbranded ELF executables by defaulting to ELFOSABI_LINUX.
+	if [ `sysctl -ni kern.elf64.fallback_brand` -eq "-1" ]; then
+		sysctl kern.elf64.fallback_brand=3 > /dev/null
+	fi
+
+	if [ `sysctl -ni kern.elf32.fallback_brand` -eq "-1" ]; then
+		sysctl kern.elf32.fallback_brand=3 > /dev/null
+	fi
+
+	_emul_path="/compat/linux"
+	mount -o nocover -t linprocfs linprocfs "${_emul_path}/proc"
+	mount -o nocover -t linsysfs linsysfs "${_emul_path}/sys"
+	mount -o nocover -t devfs devfs "${_emul_path}/dev"
+	mount -o nocover -t fdescfs fdescfs "${_emul_path}/dev/fd"
+	mount -o nocover,mode=1777 -t tmpfs tmpfs "${_emul_path}/dev/shm"
 }
 
 load_rc_config $name
 run_rc_command "$1"