summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-05 15:10:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-05 15:10:31 +0000
commit641386ef4cae2020d9b610142a2ad84ac57c0508 (patch)
treed4e02873dbcb35f21372dd9a9f3055acfc5c2bf6
parent2c935f469031f43ee5012d1e144d4afa623f44a2 (diff)
downloaddrakx-641386ef4cae2020d9b610142a2ad84ac57c0508.tar
drakx-641386ef4cae2020d9b610142a2ad84ac57c0508.tar.gz
drakx-641386ef4cae2020d9b610142a2ad84ac57c0508.tar.bz2
drakx-641386ef4cae2020d9b610142a2ad84ac57c0508.tar.xz
drakx-641386ef4cae2020d9b610142a2ad84ac57c0508.zip
saving stage1 resolv.conf is done in finish_preparing() with no special code needed for rescue
(as was done in save_stuff_for_rescue())
-rw-r--r--mdk-stage1/tools.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index a458b075f..6a34d8fb4 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -351,11 +351,6 @@ enum return_type mount_clp_may_preload(char *clp_name, char *location_mount, int
#endif
#ifndef MANDRAKE_MOVE
-static void save_stuff_for_rescue(void)
-{
- copy_file("/etc/resolv.conf", STAGE2_LOCATION "/etc/resolv.conf", NULL);
-}
-
enum return_type load_ramdisk_fd(int ramdisk_fd, int size)
{
BZFILE * st2;
@@ -415,7 +410,6 @@ enum return_type load_ramdisk_fd(int ramdisk_fd, int size)
return RETURN_ERROR;
if (IS_RESCUE) {
- save_stuff_for_rescue();
if (umount(STAGE2_LOCATION)) {
log_perror(ramdisk);
return RETURN_ERROR;