summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-02-25 16:26:20 +0000
committerThierry Vignaud <tv@mageia.org>2012-02-25 16:26:20 +0000
commit96614bec9d64d2d05e09384be143d1fb3ec44fa6 (patch)
tree1c8ba0a426230e764d891904bd517b5984161a6a
parent89c5950eb81dee0afe7b45cbd0d1c55827f95027 (diff)
downloaddrakx-96614bec9d64d2d05e09384be143d1fb3ec44fa6.tar
drakx-96614bec9d64d2d05e09384be143d1fb3ec44fa6.tar.gz
drakx-96614bec9d64d2d05e09384be143d1fb3ec44fa6.tar.bz2
drakx-96614bec9d64d2d05e09384be143d1fb3ec44fa6.tar.xz
drakx-96614bec9d64d2d05e09384be143d1fb3ec44fa6.zip
fix mounting /dev/pts & /dev/shm (mga#1023)
and do it in the right place
-rw-r--r--rescue/NEWS4
-rwxr-xr-xrescue/startssh3
-rwxr-xr-xrescue/tree/etc/rc.sysinit4
3 files changed, 4 insertions, 7 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index 54723d323..58909e787 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,7 +1,7 @@
-Version 1.31 - 25 February 2012, by Maarten Vanraes (AL13N)
+Version 1.31 - 25 February 2012, by Thierry Vignaud & Maarten Vanraes (AL13N)
- add logging to dropbear
-- make sure /dev/pts is mounted (mga#1023)
+- fix mounting /dev/pts & /dev/shm (mga#1023)
- make root user homedir /root
- add agetty (mga#2052)
diff --git a/rescue/startssh b/rescue/startssh
index 19795aaa1..48bba7cbc 100755
--- a/rescue/startssh
+++ b/rescue/startssh
@@ -10,9 +10,6 @@ fi
# change passwd file
sed -E -i -e 's/^root:[^:]*:/root:'"$passwd"':/' /etc/passwd
-# dropbear must have /dev/pts mounted
-grep '^devpts /dev/pts devpts ' /proc/mounts >/dev/null 2>/dev/null || mount -t devpts devpts /dev/pts
-
# generate host keys
mkdir -p /etc/dropbear
[[ -f /etc/dropbear/dropbear_dss_host_key ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
index e1091a3f6..a9cdef981 100755
--- a/rescue/tree/etc/rc.sysinit
+++ b/rescue/tree/etc/rc.sysinit
@@ -18,8 +18,8 @@ export UDEVRULESD=/run/udev/rules.d
mount -t devtmpfs -o mode=0755,nosuid devtmpfs /dev
mkdir /dev/pts
mkdir /dev/shm
-mount /dev/pts
-mount /dev/shm
+mount -t devpts -o mode=620 devpts /dev/pts
+mount -t tmpfs -o mode=1777,nosuid,nodev tmpfs /dev/shm
/lib/udev/udevd --daemon --resolve-names=never
udevadm trigger --type=subsystems --action=add