give mount points nice descriptive names rather than "none"

This commit is contained in:
Mike Frysinger 2008-02-26 00:04:55 +00:00
parent bf2cebf2d8
commit 143570689b

View File

@ -9,7 +9,7 @@
# tmpfs and ramfs are easy, so force one or the other. # tmpfs and ramfs are easy, so force one or the other.
mount_svcdir() mount_svcdir()
{ {
local fs= fsopts="-o rw,noexec,nodev,nosuid" devdir="none" devtmp="none" x= local fs= fsopts="-o rw,noexec,nodev,nosuid" devdir="rc-svcdir" devtmp="none" x=
local svcsize=${rc_svcsize:-1024} local svcsize=${rc_svcsize:-1024}
if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems; then if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems; then
@ -155,7 +155,7 @@ else
fi fi
# Mount required stuff as user may not have then in /etc/fstab # Mount required stuff as user may not have then in /etc/fstab
for x in "devpts /dev/pts 0755 ,gid=5,mode=0620" "tmpfs /dev/shm 1777 ,nodev" for x in "devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" "tmpfs /dev/shm 1777 ,nodev shm"
do do
set -- ${x} set -- ${x}
grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue
@ -172,7 +172,7 @@ do
if fstabinfo --quiet "$2"; then if fstabinfo --quiet "$2"; then
mount -n "$2" mount -n "$2"
else else
mount -n -t "$1" -o noexec,nosuid"$4" none "$2" mount -n -t "$1" -o noexec,nosuid"$4" "$5" "$2"
fi fi
eend $? eend $?
fi fi