summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-02-25 22:15:12 +0000
committerThierry Vignaud <tv@mageia.org>2012-02-25 22:15:12 +0000
commit18cbebd4e177d93c478d7039db6591629e2d19a5 (patch)
tree1003951240a34235afd777d8c88d827197491a8c /rescue
parent2b44db400dd924b9c58ac1a1f3a9252a7b5387be (diff)
downloaddrakx-18cbebd4e177d93c478d7039db6591629e2d19a5.tar
drakx-18cbebd4e177d93c478d7039db6591629e2d19a5.tar.gz
drakx-18cbebd4e177d93c478d7039db6591629e2d19a5.tar.bz2
drakx-18cbebd4e177d93c478d7039db6591629e2d19a5.tar.xz
drakx-18cbebd4e177d93c478d7039db6591629e2d19a5.zip
really fix mounting /dev/pts & /dev/shm (mga#1023)
Diffstat (limited to 'rescue')
-rw-r--r--rescue/NEWS3
-rw-r--r--rescue/dirs2
-rwxr-xr-xrescue/make_rescue_img2
-rwxr-xr-xrescue/tree/etc/rc.sysinit5
4 files changed, 4 insertions, 8 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index 7da8dee33..6df64546f 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,7 +1,8 @@
-Version 1.32 - 25 February 2012, by Maarten Vanraes (AL13N)
+Version 1.32 - 25 February 2012, by Thierry Vignaud & Maarten Vanraes (AL13N)
- don't overwrite /dev after udev handles it
- add some tests and error handling in startssh
+- really fix mounting /dev/pts & /dev/shm (mga#1023)
Version 1.31 - 25 February 2012, by Thierry Vignaud & Maarten Vanraes (AL13N)
diff --git a/rescue/dirs b/rescue/dirs
index e6d5a5d47..6b6d88a6f 100644
--- a/rescue/dirs
+++ b/rescue/dirs
@@ -2,5 +2,3 @@
/tmp
/modules
/proc
-/dev
-/dev/pts
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index a2c9fdf9b..59b0f7073 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -21,8 +21,6 @@ _ 'find . -name "*~" | xargs rm -f';
mkdir_p($tmp . chomp_($_)) foreach cat_("dirs");
_ "cp -a tree/* $tmp";
_ "find $tmp -name .svn | xargs rm -rf";
-_ "perl devices.pl $tmp/dev";
-_ "mkfifo $tmp/dev/initctl";
substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue";
_ "../tools/install-xml-file-list list.xml $tmp";
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
index 602a05cdd..96d2f7d88 100755
--- a/rescue/tree/etc/rc.sysinit
+++ b/rescue/tree/etc/rc.sysinit
@@ -18,10 +18,9 @@ export UDEVRULESD=/run/udev/rules.d
mount -t devtmpfs -o mode=0755,nosuid devtmpfs /dev
mkdir /dev/pts
mkdir /dev/shm
-mount -t devpts -o mode=620 devpts /dev/pts
-mount -t tmpfs -o mode=1777,nosuid,nodev tmpfs /dev/shm
+mount /dev/pts
+mount /dev/shm
-cp -a /tmp/stage2/dev/. /dev/
/lib/udev/udevd --daemon --resolve-names=never
udevadm trigger --type=subsystems --action=add
udevadm trigger --type=devices --action=add