summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-26 02:51:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-26 02:51:07 +0000
commit128d70150bc0c5188503f90d4d97311d7ba40cee (patch)
treeec01837c6c36c84715c853aefea4d2b213d12da1 /mdk-stage1
parent9c29b12f0d1ea1a7d88d41d24c72a85cbc1b8862 (diff)
downloaddrakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar
drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.gz
drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.bz2
drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.xz
drakx-backup-do-not-use-128d70150bc0c5188503f90d4d97311d7ba40cee.zip
adapt to new directories layout:
- Mandrake/mdkinst -> install/stage2/live - Mandrake/base/mdkinst_stage2.bz2 -> install/stage2/mdkinst_stage2.bz2 - Mandrake/base/rpmsrate -> media/media_info/rpmsrate - Mandrake/RPMS -> media/main - images -> install/images - isolinux -> install/isolinux - Mandrake/share/advertising -> install/extra/advertising
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/config-stage1.h4
-rw-r--r--mdk-stage1/disk.c4
-rw-r--r--mdk-stage1/doc/TECH-INFOS2
-rw-r--r--mdk-stage1/network.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index 1b9dae230..2a9cfa9ce 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -27,8 +27,8 @@
#define RAMDISK_COMPRESSION_RATIO 1.95
-#define LIVE_LOCATION "/Mandrake/mdkinst/"
-#define RAMDISK_LOCATION "/Mandrake/base/"
+#define LIVE_LOCATION "/install/stage2/live/"
+#define RAMDISK_LOCATION "/install/stage2/"
#define SLASH_LOCATION "/sysroot"
#define STAGE2_LOCATION SLASH_LOCATION "/tmp/stage2"
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index 9ae6b74d8..716b38f7e 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -360,9 +360,9 @@ process_recovery(void)
goto examine_next_part;
}
strcpy(location, disk_own_mount);
- strcat(location, "/Mandrake/base");
+ strcat(location, "/install/stage2");
if (access(location, R_OK)) {
- log_message("Mandrake/base is not here");
+ log_message("install/stage2 is not here");
goto examine_next_part;
}
diff --git a/mdk-stage1/doc/TECH-INFOS b/mdk-stage1/doc/TECH-INFOS
index c85288617..e66c9daa5 100644
--- a/mdk-stage1/doc/TECH-INFOS
+++ b/mdk-stage1/doc/TECH-INFOS
@@ -91,7 +91,7 @@ This gives for example for:
You may specify a stage2 auto-install file, different from the
-default `auto_inst.cfg.pl' in Mandrake/base, by filling the
+default `auto_inst.cfg.pl' in install/, by filling the
`bootfile' parameter of your DHCP server response.
Note that if the name ends with `-IP' or `-IP.pl', IP will be
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index 2f245d97f..b8c77dccf 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -669,7 +669,7 @@ static int mirrorlist_entry_split(const char *entry, char *mirror[4]) /* mirror
mirror[2] = strndup(entry, host_sep - entry);
entry = host_sep;
- path_sep = strstr(entry, "/Mandrake/RPMS");
+ path_sep = strstr(entry, "/media/main");
if (!path_sep || path_sep == entry) {
log_message("NETWORK: this path isn't valid : \"%s\"", entry);
return -1;