summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-02-26 00:04:55 +0000
committerMike Frysinger <vapier@gentoo.org>2008-02-26 00:04:55 +0000
commit143570689bc93c68fa83c3eb56d622b707ec0e18 (patch)
treeaa4262d7137825346796d836bba2cf80166910da
parentbf2cebf2d8ab82789e5e087871a6e0dbca6289b9 (diff)
downloadopenrc-143570689bc93c68fa83c3eb56d622b707ec0e18.tar.gz
openrc-143570689bc93c68fa83c3eb56d622b707ec0e18.tar.bz2
openrc-143570689bc93c68fa83c3eb56d622b707ec0e18.tar.xz
give mount points nice descriptive names rather than "none"
-rwxr-xr-xsh.Linux/init.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh
index 54020ad..c006d5f 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -9,7 +9,7 @@
# tmpfs and ramfs are easy, so force one or the other.
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}
if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems; then
@@ -155,7 +155,7 @@ else
fi
# 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
set -- ${x}
grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue
@@ -172,7 +172,7 @@ do
if fstabinfo --quiet "$2"; then
mount -n "$2"
else
- mount -n -t "$1" -o noexec,nosuid"$4" none "$2"
+ mount -n -t "$1" -o noexec,nosuid"$4" "$5" "$2"
fi
eend $?
fi