summaryrefslogtreecommitdiff
path: root/sh.Linux
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-10-22 20:24:00 +0000
committerRoy Marples <roy@marples.name>2007-10-22 20:24:00 +0000
commit2d7f57d462d90ff33e4e0a4e36290fc5f90fc9d6 (patch)
treecbd59b04b17b9a90e1f7d7b27d352f688c852208 /sh.Linux
parent9dddb43eb49d07d8c1b87e11c8d259fd41a34ae4 (diff)
downloadopenrc-2d7f57d462d90ff33e4e0a4e36290fc5f90fc9d6.tar.gz
openrc-2d7f57d462d90ff33e4e0a4e36290fc5f90fc9d6.tar.bz2
openrc-2d7f57d462d90ff33e4e0a4e36290fc5f90fc9d6.tar.xz
Fix init.sh for shm again
Diffstat (limited to 'sh.Linux')
-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 e45c734..bec2564 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -207,14 +207,14 @@ else
fi
# Mount required stuff as user may not have then in /etc/fstab
-for x in "devpts /dev/pts" "tmpfs /dev/shm ,nodev"; do
+for x in "devpts /dev/pts 0755 ,gid=5,mode=0620" "tmpfs /dev/shm 1777 ,nodev"; do
set -- ${x}
grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue
mountinfo -q "$2" && continue
if [ ! -d "$2" ] && \
[ "${devfs}" = "yes" -o "${udev}" = "yes" ]; then
- mkdir -p "$2" >/dev/null 2>/dev/null || \
+ mkdir -m "$3" -p "$2" >/dev/null 2>/dev/null || \
ewarn "Could not create $2!"
fi
@@ -223,7 +223,7 @@ for x in "devpts /dev/pts" "tmpfs /dev/shm ,nodev"; do
if fstabinfo --quiet "$2"; then
try mount -n "$2"
else
- try mount -n -t "$1" -o gid=5,mode=0620,noexec,nosuid"$3" none "$2"
+ try mount -n -t "$1" -o noexec,nosuid"$4" none "$2"
fi
eend $?
fi