diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-06-25 08:36:35 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-06-25 08:36:35 +0000 |
| commit | ecc78994996036ec5e907d596dd3d7c27fd9ce3c (patch) | |
| tree | bacf12c2c1840725ede2ed09fc5928761e37ce4b /mdk-stage1/directory.c | |
| parent | 4b2530a25448b4ced0407d2db53403d3a729a6bd (diff) | |
| download | drakx-ecc78994996036ec5e907d596dd3d7c27fd9ce3c.tar drakx-ecc78994996036ec5e907d596dd3d7c27fd9ce3c.tar.gz drakx-ecc78994996036ec5e907d596dd3d7c27fd9ce3c.tar.bz2 drakx-ecc78994996036ec5e907d596dd3d7c27fd9ce3c.tar.xz drakx-ecc78994996036ec5e907d596dd3d7c27fd9ce3c.zip | |
do not use ramdisk in nfs install
Diffstat (limited to 'mdk-stage1/directory.c')
| -rw-r--r-- | mdk-stage1/directory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mdk-stage1/directory.c b/mdk-stage1/directory.c index 0e6caeb52..d572cd800 100644 --- a/mdk-stage1/directory.c +++ b/mdk-stage1/directory.c @@ -127,6 +127,7 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me } #endif + loopdev = NULL; if (!stat(location_full, &statbuf) && !S_ISDIR(statbuf.st_mode)) { log_message("%s exists and is not a directory, assuming this is an ISO image", location_full); if (lomount(location_full, IMAGE_LOCATION, &loopdev, 0)) { @@ -141,7 +142,7 @@ enum return_type try_with_directory(char *directory, char *method_live, char *me add_to_env("METHOD", method_live); } #ifndef MANDRAKE_MOVE - if (IS_SPECIAL_STAGE2 || ramdisk_possible()) { + if (IS_SPECIAL_STAGE2 || ((loopdev || !streq(method_live, "nfs")) && ramdisk_possible()))) { /* RAMDISK install */ if (access(IMAGE_LOCATION RAMDISK_LOCATION, R_OK)) { stg1_error_message("I can't find the " DISTRIB_NAME " Distribution in the specified directory. " |