From c071604907bc848205602cfc863e0e943cfff17d Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 1 Jul 2004 04:18:32 +0000 Subject: stage1 used to write files /tmp/network, /tmp/ifcfg-eth0, /etc/modules.conf but those files are in /stage1 after pivot rooting, so: - write modules.conf in /tmp instead of /etc - cp those files from /stage1/tmp to /tmp before umounting /stage1 --- mdk-stage1/modules.c | 2 +- perl-install/install2.pm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index efd9efdb8..0f6d6de7f 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -308,7 +308,7 @@ void init_modules_insmoding(void) static void add_modules_conf(char * str) { static char data[5000] = ""; - char * target = "/etc/modules.conf"; + char * target = "/tmp/modules.conf"; int fd; if (strlen(data) + strlen(str) >= sizeof(data)) diff --git a/perl-install/install2.pm b/perl-install/install2.pm index d3823322e..7ca1e9c17 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -441,6 +441,8 @@ sub main { move::init($o); } + cp_f(glob('/stage1/tmp/*'), '/tmp'); + #- free up stage1 memory eval { fs::umount($_) } foreach qw(/stage1/proc/bus/usb /stage1/proc /stage1); @@ -455,7 +457,7 @@ sub main { eval { spawnShell() }; modules::load_dependencies(($::testing ? ".." : "") . "/modules/modules.dep"); - modules::read_stage1_conf($_) foreach "/tmp/conf.modules", "/etc/modules.conf"; + modules::read_stage1_conf('/tmp/modules.conf'); modules::read_already_loaded(); #- done before auto_install is called to allow the -IP feature on auto_install file name -- cgit v1.2.1