diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-20 13:42:05 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-11-20 13:42:05 +0000 |
| commit | 7443c32dffe417e789d5635593be1d0d36357c23 (patch) | |
| tree | f381c3e7a5d34b9658b9868fcf37da05bdbd31c1 | |
| parent | d2d097516392dffb4518a4aab61fd85dfca8b84d (diff) | |
| download | drakx-7443c32dffe417e789d5635593be1d0d36357c23.tar drakx-7443c32dffe417e789d5635593be1d0d36357c23.tar.gz drakx-7443c32dffe417e789d5635593be1d0d36357c23.tar.bz2 drakx-7443c32dffe417e789d5635593be1d0d36357c23.tar.xz drakx-7443c32dffe417e789d5635593be1d0d36357c23.zip | |
live boot option is deprecated
| -rw-r--r-- | mdk-stage1/stage1.c | 2 | ||||
| -rw-r--r-- | mdk-stage1/stage1.h | 2 | ||||
| -rw-r--r-- | mdk-stage1/tools.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c index 93935439a..f1f68ec22 100644 --- a/mdk-stage1/stage1.c +++ b/mdk-stage1/stage1.c @@ -392,7 +392,7 @@ int mandrake_move_pre(void) static enum return_type handle_clp(char* clp, char* live, char* location_live, char* location_mount, int* is_symlink, char* clp_tmpfs) { static int count = 0; - if (IS_LIVE || access(clp, R_OK)) { + if (access(clp, R_OK)) { log_message("no %s found (or disabled), trying to fallback on plain tree", clp); if (!access(live, R_OK)) { if (scall(symlink(location_live, location_mount), "symlink")) diff --git a/mdk-stage1/stage1.h b/mdk-stage1/stage1.h index 84d760cd9..926f84151 100644 --- a/mdk-stage1/stage1.h +++ b/mdk-stage1/stage1.h @@ -36,7 +36,6 @@ extern char * stage2_kickstart; #define MODE_EXPERT (1 << 1) #define MODE_RESCUE (1 << 3) #define MODE_AUTOMATIC (1 << 4) -#define MODE_LIVE (1 << 5) #define MODE_DEBUGSTAGE1 (1 << 6) #define MODE_SPECIAL_STAGE2 (1 << 8) #define MODE_RAMDISK (1 << 9) @@ -50,7 +49,6 @@ extern char * stage2_kickstart; #define IS_EXPERT (get_param(MODE_EXPERT)) #define IS_RESCUE (get_param(MODE_RESCUE)) #define IS_AUTOMATIC (get_param(MODE_AUTOMATIC)) -#define IS_LIVE (get_param(MODE_LIVE)) #define IS_DEBUGSTAGE1 (get_param(MODE_DEBUGSTAGE1)) #define IS_SPECIAL_STAGE2 (get_param(MODE_SPECIAL_STAGE2)) #define IS_RAMDISK (get_param(MODE_RAMDISK)) diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c index 2c5f9c3a7..ea8450cef 100644 --- a/mdk-stage1/tools.c +++ b/mdk-stage1/tools.c @@ -95,7 +95,6 @@ void process_cmdline(void) if (!strcmp(name, "netauto")) set_param(MODE_NETAUTO); if (!strcmp(name, "recovery")) set_param(MODE_RECOVERY); if (!strcmp(name, "special_stage2")) set_param(MODE_SPECIAL_STAGE2); - if (!strcmp(name, "live")) set_param(MODE_LIVE); if (!strcmp(name, "debugstage1")) set_param(MODE_DEBUGSTAGE1); if (!strcmp(name, "automatic")) { set_param(MODE_AUTOMATIC); |