summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-03 11:21:52 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-03 11:21:52 +0000
commit5758121daa7e4eba12eaa4ab56a6958709aa7baf (patch)
tree426b364588732d5b96719c65abf073e21c84c0f3
parentdf9dbca7427c7ba34973cb2622c4003852a231d3 (diff)
downloaddrakx-5758121daa7e4eba12eaa4ab56a6958709aa7baf.tar
drakx-5758121daa7e4eba12eaa4ab56a6958709aa7baf.tar.gz
drakx-5758121daa7e4eba12eaa4ab56a6958709aa7baf.tar.bz2
drakx-5758121daa7e4eba12eaa4ab56a6958709aa7baf.tar.xz
drakx-5758121daa7e4eba12eaa4ab56a6958709aa7baf.zip
create /sys at build time rather than run time
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/init.c1
4 files changed, 5 insertions, 2 deletions
diff --git a/images/NEWS b/images/NEWS
index 38f151b2f..2cd7818d1 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- precreate /sys
+
Version 1.78 - 31 August 2012 by Thierry Vignaud
- include new 'hid-generic' driver (mga#7130, #7248)
diff --git a/images/make_boot_img b/images/make_boot_img
index 9d5ad3ebb..b0b9d3f01 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -209,7 +209,7 @@ fi
}
# ka deploy need some files in all.rdz
if ($ENV{DEBUGSTAGE1}) {
- mkdir_p("$tmp_initrd/$_") foreach qw(dev ka proc var/tmp tmp/stage2);
+ mkdir_p("$tmp_initrd/$_") foreach qw(dev ka proc sys var/tmp tmp/stage2);
symlink("/sbin", "$tmp_initrd/bin");
cp_af("/usr/bin/ka-d-client", "$tmp_initrd/ka/ka-d-client");
cp_af("/bin/busybox.static", "$tmp_initrd/sbin/busybox");
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 3cbb5552c..1ad920aa0 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,5 @@
+- rely on /sys being created in images
+
1.69
- do not try to mount /proc/bus/usb
- load hid-generic
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index 9f55bcc40..21b220c1a 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -414,7 +414,6 @@ int main(int argc, char **argv)
if (!testing) {
if (mount("/proc", "/proc", "proc", 0, NULL))
fatal_error("Unable to mount proc filesystem");
- mkdir("/sys", 0755);
if (mount("none", "/sys", "sysfs", 0, NULL))
fatal_error("Unable to mount sysfs filesystem");
if (mount("none", "/sys/kernel/debug", "debugfs", 0, NULL))