diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-03-09 15:12:01 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-03-09 15:12:01 +0000 |
| commit | e4b00449f014c0e2000e360114634a24bde6899d (patch) | |
| tree | 6ae87bd1c53cbe297e2e75a2b23536c325a07a9e | |
| parent | 3b84f12383e0c7483ff5d700f3a18d362d1248b2 (diff) | |
| download | drakx-backup-do-not-use-e4b00449f014c0e2000e360114634a24bde6899d.tar drakx-backup-do-not-use-e4b00449f014c0e2000e360114634a24bde6899d.tar.gz drakx-backup-do-not-use-e4b00449f014c0e2000e360114634a24bde6899d.tar.bz2 drakx-backup-do-not-use-e4b00449f014c0e2000e360114634a24bde6899d.tar.xz drakx-backup-do-not-use-e4b00449f014c0e2000e360114634a24bde6899d.zip | |
expert mode is dead
| -rw-r--r-- | mdk-stage1/stage1.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/stage1.h | 2 | ||||
| -rw-r--r-- | mdk-stage1/tools.c | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 55fb7160c..d6364c6a0 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -193,7 +193,7 @@ static void spawn_interactive(void) perror("could not set new controlling tty"); fif_out = open(interactive_fifo, O_WRONLY); - printf("Please enter your command (availables: [+,-] [rescue,expert]).\n"); + printf("Please enter your command (availables: [+,-] [rescue]).\n"); while (1) { char s[50]; diff --git a/mdk-stage1/stage1.h b/mdk-stage1/stage1.h index e3691a352..55a9c4307 100644 --- a/mdk-stage1/stage1.h +++ b/mdk-stage1/stage1.h @@ -31,7 +31,6 @@ extern char * interactive_fifo; #define MODE_TESTING (1 << 0) -#define MODE_EXPERT (1 << 1) #define MODE_RESCUE (1 << 3) #define MODE_AUTOMATIC (1 << 4) #define MODE_KEEP_MOUNTED (1 << 5) /* for rescue */ @@ -43,7 +42,6 @@ extern char * interactive_fifo; #define MODE_RECOVERY (1 << 14) #define IS_TESTING (get_param(MODE_TESTING)) -#define IS_EXPERT (get_param(MODE_EXPERT)) #define IS_RESCUE (get_param(MODE_RESCUE)) #define IS_AUTOMATIC (get_param(MODE_AUTOMATIC)) #define IS_DEBUGSTAGE1 (get_param(MODE_DEBUGSTAGE1)) diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index 8798b48ac..042eab53b 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -101,7 +101,6 @@ void process_cmdline(void) params[param_number].name = name; params[param_number].value = value; param_number++; - if (!strcmp(name, "expert")) set_param(MODE_EXPERT); if (!strcmp(name, "changedisk")) set_param(MODE_CHANGEDISK); if (!strcmp(name, "updatemodules")) set_param(MODE_UPDATEMODULES); if (!strcmp(name, "rescue")) set_param(MODE_RESCUE); @@ -144,13 +143,11 @@ int get_param(int i) buf[nb] = '\0'; ptr = buf; while ((ptr = strstr(ptr, "+ "))) { - if (!strncmp(ptr+2, "expert", 6)) set_param(MODE_EXPERT); if (!strncmp(ptr+2, "rescue", 6)) set_param(MODE_RESCUE); ptr++; } ptr = buf; while ((ptr = strstr(ptr, "- "))) { - if (!strncmp(ptr+2, "expert", 6)) unset_param(MODE_EXPERT); if (!strncmp(ptr+2, "rescue", 6)) unset_param(MODE_RESCUE); ptr++; } |