diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-11 18:21:13 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-11 18:21:13 +0000 |
| commit | 78c546d40cff285747ead9c15e5cb5b9496b7164 (patch) | |
| tree | a34f5a92d9daa884bdc4548300057d97f4cff230 /mdk-stage1/stage1.c | |
| parent | e7d0a4b83de6168fc5294a605a6c97d2467c4d20 (diff) | |
| download | drakx-backup-do-not-use-78c546d40cff285747ead9c15e5cb5b9496b7164.tar drakx-backup-do-not-use-78c546d40cff285747ead9c15e5cb5b9496b7164.tar.gz drakx-backup-do-not-use-78c546d40cff285747ead9c15e5cb5b9496b7164.tar.bz2 drakx-backup-do-not-use-78c546d40cff285747ead9c15e5cb5b9496b7164.tar.xz drakx-backup-do-not-use-78c546d40cff285747ead9c15e5cb5b9496b7164.zip | |
- add FTP
- add HTTP
- use single place for mountpoints and static directories
Diffstat (limited to 'mdk-stage1/stage1.c')
| -rw-r--r-- | mdk-stage1/stage1.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 935d92810..d18d0d93a 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -189,6 +189,7 @@ int main(int argc, char **argv, char **env) open_log(); log_message("welcome to the " DISTRIB_NAME " install (stage1, version " VERSION " built " __DATE__ " " __TIME__")"); process_cmdline(); + handle_env(env); spawn_shell(); if (load_modules_dependencies()) fatal_error("could not open and parse modules dependencies"); @@ -203,8 +204,8 @@ int main(int argc, char **argv, char **env) fatal_error("could not select an installation method"); if (!IS_RAMDISK) { - if (symlink("/tmp/image/Mandrake/mdkinst", "/tmp/stage2") != 0) - fatal_error("symlink to /tmp/stage2 failed"); + if (symlink(IMAGE_LOCATION LIVE_LOCATION, STAGE2_LOCATION) != 0) + fatal_error("symlink to " STAGE2_LOCATION " failed"); } if (IS_RESCUE) { @@ -223,10 +224,11 @@ int main(int argc, char **argv, char **env) argptr = stage2_args; *argptr++ = "/usr/bin/runinstall2"; + *argptr++ = "--method"; *argptr++ = method_name; *argptr++ = NULL; - execve(stage2_args[0], stage2_args, env); + execve(stage2_args[0], stage2_args, grab_env()); printf("error in exec of stage2 :-(\n"); fatal_error(strerror(errno)); |