Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F163415557
D26217.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D26217.id.diff
View Options
Index: stable/12/libexec/rc/rc.d/linux
===================================================================
--- stable/12/libexec/rc/rc.d/linux
+++ stable/12/libexec/rc/rc.d/linux
@@ -15,6 +15,12 @@
start_cmd="${name}_start"
stop_cmd=":"
+unmounted()
+{
+ [ `stat -f "%d" "$1"` == `stat -f "%d" "$1/.."` -a \
+ `stat -f "%i" "$1"` != `stat -f "%i" "$1/.."` ]
+}
+
linux_start()
{
local _emul_path _tmpdir
@@ -48,11 +54,12 @@
if checkyesno linux_mounts_enable; then
_emul_path="/compat/linux"
- mount -t linprocfs linprocfs "${_emul_path}/proc"
- mount -t linsysfs linsysfs "${_emul_path}/sys"
- mount -t devfs devfs "${_emul_path}/dev"
- mount -o linrdlnk -t fdescfs fdescfs "${_emul_path}/dev/fd"
- mount -o mode=1777 -t tmpfs tmpfs "${_emul_path}/dev/shm"
+ unmounted "${_emul_path}/proc" && mount -t linprocfs linprocfs "${_emul_path}/proc"
+ unmounted "${_emul_path}/sys" && mount -t linsysfs linsysfs "${_emul_path}/sys"
+ unmounted "${_emul_path}/dev" && mount -t devfs devfs "${_emul_path}/dev"
+ unmounted "${_emul_path}/dev/fd" && mount -o linrdlnk -t fdescfs fdescfs "${_emul_path}/dev/fd"
+ unmounted "${_emul_path}/dev/shm" && mount -o mode=1777 -t tmpfs tmpfs "${_emul_path}/dev/shm"
+ true
fi
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Jul 24, 12:41 AM (20 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35398240
Default Alt Text
D26217.id.diff (1 KB)
Attached To
Mode
D26217: missing "nocover" mount option on 12-STABLE makes rc.d/linux error out
Attached
Detach File
Event Timeline
Log In to Comment