summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-01 04:18:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-01 04:18:32 +0000
commitc071604907bc848205602cfc863e0e943cfff17d (patch)
tree11df520224edbab642b8ed34ae3382392a5493c0 /perl-install
parent32972f9ae514f69cdd6ee1ad245826cb91f6798c (diff)
downloaddrakx-c071604907bc848205602cfc863e0e943cfff17d.tar
drakx-c071604907bc848205602cfc863e0e943cfff17d.tar.gz
drakx-c071604907bc848205602cfc863e0e943cfff17d.tar.bz2
drakx-c071604907bc848205602cfc863e0e943cfff17d.tar.xz
drakx-c071604907bc848205602cfc863e0e943cfff17d.zip
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
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm4
1 files changed, 3 insertions, 1 deletions
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