summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-03 11:21:56 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-03 11:21:56 +0000
commite6383c95c8910f98729642ee08f35ff4bc70c377 (patch)
tree8a90d825caed692a320caca0dc2eaa119045c47e
parent5758121daa7e4eba12eaa4ab56a6958709aa7baf (diff)
downloaddrakx-e6383c95c8910f98729642ee08f35ff4bc70c377.tar
drakx-e6383c95c8910f98729642ee08f35ff4bc70c377.tar.gz
drakx-e6383c95c8910f98729642ee08f35ff4bc70c377.tar.bz2
drakx-e6383c95c8910f98729642ee08f35ff4bc70c377.tar.xz
drakx-e6383c95c8910f98729642ee08f35ff4bc70c377.zip
mount /dev as devtmpfs earlier, in stage1 rather than in stage2
(based on pok's idead @mdv but fixed)
-rwxr-xr-ximages/make_boot_img4
-rw-r--r--mdk-stage1/NEWS1
-rw-r--r--mdk-stage1/init.c4
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm1
-rw-r--r--rescue/NEWS1
-rwxr-xr-xrescue/tree/etc/rc.sysinit1
7 files changed, 8 insertions, 6 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index b0b9d3f01..2d01d6299 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -218,9 +218,7 @@ fi
symlink('busybox', $tmp_initrd . "/sbin/$_") foreach @funct;
}
- my $devs = sprintf "ls /dev/{%s}", join(',', qw(console fb0 fd0 loop3 mem null ppp ptmx ptyp0 ram3 random tty[0-7] ttyp0 ttyS0 urandom));
-
- _ "(cd $tmp_initrd; (find . ; $devs) | cpio -o -c --quiet) | xz --check=crc32 --lzma2=dict=512KiB > $img";
+ _ "(cd $tmp_initrd; find . | cpio -o -c --quiet) | xz --check=crc32 --lzma2=dict=512KiB > $img";
_ "rm -rf $tmp_initrd";
}
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 1ad920aa0..8024c2a2a 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,4 @@
+- mount /dev as devtmpfs (pok, mdv)
- rely on /sys being created in images
1.69
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index 21b220c1a..509dc2cb4 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -416,8 +416,10 @@ int main(int argc, char **argv)
fatal_error("Unable to mount proc filesystem");
if (mount("none", "/sys", "sysfs", 0, NULL))
fatal_error("Unable to mount sysfs filesystem");
- if (mount("none", "/sys/kernel/debug", "debugfs", 0, NULL))
+ if (mount("none", "/sys/kernel/debug", "debugfs", 0, "mode=0755,nosuid"))
fatal_error("Unable to mount debugfs filesystem");
+ if (mount("none", "/dev", "devtmpfs", 0, NULL))
+ fatal_error("Unable to mount dev filesystem");
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d8f41fda0..ebe6afb5d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- rely on stage1 for mounting /dev
+
Version 14.38 - 2 September 2012
- Mageia 3 alpha 1 banner
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 1bd3fcefe..0e12857aa 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -304,7 +304,6 @@ sub start_udev() {
mkdir_p("/run/initramfs");
# Start up udev and trigger cold plugs
- run_program::run("mount", "-t", "devtmpfs", "-o", "mode=0755,nosuid", "devtmpfs", "/dev");
mkdir("/dev/$_", 0755) foreach qw(pts shm);
run_program::run("mount", "-t", "devpts", "-o", "gid=5,mode=620,noexec,nosuid", "devpts", "/dev/pts");
run_program::run("mount", "-t", "tmpfs", "-o", "mode=1777,nosuid,nodev", "tmpfs", "/dev/shm");
diff --git a/rescue/NEWS b/rescue/NEWS
index f64a8ea54..2b42655f8 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -3,6 +3,7 @@
- adapt to /usr move
- default to the higher version when there're several mga roots (mga#6003)
- fix detecting USB devices with kernel-3.5+ (mga#7248)
+- rely on stage1 for mounting /dev
- revert to "linux" terminfo
- stop fixing the raid udev rule now that it has been fixed
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
index 04b5a50dd..0bf2c8b58 100755
--- a/rescue/tree/etc/rc.sysinit
+++ b/rescue/tree/etc/rc.sysinit
@@ -15,7 +15,6 @@ mkdir /run
mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run
mkdir -p /run/udev/rules.d
export UDEVRULESD=/run/udev/rules.d
-mount -t devtmpfs -o mode=0755,nosuid devtmpfs /dev
mkdir /dev/pts
mkdir /dev/shm
mount /dev/pts