diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-29 05:42:55 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-29 05:42:55 +0000 |
| commit | 8f375063143633fc031636cf687d7825a06ce325 (patch) | |
| tree | 383c6c9030e52ad79fc5917b8aa52da6bc19b28b | |
| parent | 6bf4329798cfd034e92441d3a5e77e2d4ba98167 (diff) | |
| download | drakx-backup-do-not-use-8f375063143633fc031636cf687d7825a06ce325.tar drakx-backup-do-not-use-8f375063143633fc031636cf687d7825a06ce325.tar.gz drakx-backup-do-not-use-8f375063143633fc031636cf687d7825a06ce325.tar.bz2 drakx-backup-do-not-use-8f375063143633fc031636cf687d7825a06ce325.tar.xz drakx-backup-do-not-use-8f375063143633fc031636cf687d7825a06ce325.zip | |
s/MandrakeMove/Move/
| -rw-r--r-- | mdk-stage1/config-stage1.h | 2 | ||||
| -rw-r--r-- | mdk-stage1/stage1.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h index 5d42bab1a..562db2538 100644 --- a/mdk-stage1/config-stage1.h +++ b/mdk-stage1/config-stage1.h @@ -33,7 +33,7 @@ #ifdef MANDRAKE_MOVE #define MEM_LIMIT_MOVE 120 -#define DISTRIB_NAME "Mandrakemove" +#define DISTRIB_NAME "Move" #define IMAGE_LOCATION "/sysroot/cdrom" #define IMAGE_LOCATION_REAL "/sysroot/image" #define SLASH_LOCATION "/sysroot" diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index ecfa7b533..f26df2c72 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -449,6 +449,7 @@ int mandrake_move_post(void) return RETURN_ERROR; while (fgets(buf, sizeof(buf), f)) { char oldpath[500], newpath[500]; + log_message("move: before creating symlink we have %s", buf); buf[strlen(buf)-1] = '\0'; // trim \n sprintf(oldpath, "%s%s", LIVE_LOCATION_REL, buf); sprintf(newpath, "%s%s", SLASH_LOCATION, buf); @@ -598,7 +599,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) stg1_info_message(DISTRIB_NAME " typically needs more than %d Mbytes of memory (detected %d Mbytes). You may proceed, but the machine may crash or lock up for no apparent reason. Continue at your own risk. Alternatively, you may reboot your system now.", MEM_LIMIT_MOVE, total_memory()); if (mandrake_move_pre() != RETURN_OK) - stg1_error_message("Fatal error when preparing Mandrakemove."); + stg1_error_message("Fatal error when preparing Move."); #endif #ifndef DISABLE_DISK @@ -618,7 +619,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused)) #ifdef MANDRAKE_MOVE if (mandrake_move_post() != RETURN_OK) - stg1_error_message("Fatal error when launching Mandrakemove."); + stg1_error_message("Fatal error when launching Move."); #endif /* load usb interface as soon as possible, helps usb mouse detection in stage2 |