View | Details | Raw Unified | Return to bug 8061
Collapse All | Expand All

(-)udevd.init (-4 / +4 lines)
Lines 47-53 Link Here
47 
get_pts_attributes()
 47 
get_pts_attributes()
48 
{
 48 
{
49 
	local rc line opts
 49 
	local rc line opts
50 
	line=`grep -F " $udev_root/pts " /etc/mtab 2>/dev/null | head -1`
 50 
	line=`grep "[[:space:]]$udev_root/pts[[:space:]]" /proc/mounts 2>/dev/null | head -1`
51 
	test -n "$line" || return 1
 51 
	test -n "$line" || return 1
52 
	set -- $line ''
 52 
	set -- $line ''
53 
	opts=$4
 53 
	opts=$4
Lines 63-69 Link Here
63 
	rc=$?
 63 
	rc=$?
64 
	RETVAL=0
 64 
	RETVAL=0
65 
	if test $rc = 0; then
 65 
	if test $rc = 0; then
66 
	    if grep -qF " $udev_root/pts " /proc/mounts; then
 66 
	    if grep -q "[[:space:]]$udev_root/pts[[:space:]]" /proc/mounts; then
67 
		mountcmd="mount --move pts $udev_root/pts"
 67 
		mountcmd="mount --move pts $udev_root/pts"
68 
	    else
 68 
	    else
69 
		mountcmd="mount -t devpts devpts $udev_root/pts -o $opts"
 69 
		mountcmd="mount -t devpts devpts $udev_root/pts -o $opts"
Lines 78-84 Link Here
78 
{
 78 
{
79 
	test -f /proc/mounts || return 0
 79 
	test -f /proc/mounts || return 0
80 
	local mountcmd
 80 
	local mountcmd
81 
	if grep -qF " $udev_root/shm " /proc/mounts; then
 81 
	if grep -q "[[:space:]]$udev_root/shm[[:space:]]" /proc/mounts; then
82 
		mountcmd="mount --move shm $udev_root/shm"
 82 
		mountcmd="mount --move shm $udev_root/shm"
83 
	else
 83 
	else
84 
		mountcmd="mount -t tmpfs shmfs $udev_root/shm"
 84 
		mountcmd="mount -t tmpfs shmfs $udev_root/shm"
Lines 127-133 Link Here
127 
	cd "$udev_root"
 127 
	cd "$udev_root"
128 
	RETVAL=$?
 128 
	RETVAL=$?
129 
	[ $RETVAL -ne 0 ] && return $RETVAL
 129 
	[ $RETVAL -ne 0 ] && return $RETVAL
130 
	if ! grep -qF "udev $udev_root tmpfs" /proc/mounts; then
 130 
	if ! grep -q "udev[[:space:]]$udev_root[[:space:]]tmpfs" /proc/mounts; then
131 
		mounted=0
 131 
		mounted=0
132 
		mount -t tmpfs udev $udev_root
 132 
		mount -t tmpfs udev $udev_root
133 
		ACTION=add DEVPATH=/class/mem/null $bin mem/null;# && \
 133 
		ACTION=add DEVPATH=/class/mem/null $bin mem/null;# && \

Return to bug 8061