diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-06-15 09:13:56 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-06-15 09:13:56 +0000 |
| commit | 90454d65291b4f33913880d179ae5439e386c7fa (patch) | |
| tree | a50b3f9d17aec0c5031ba313dee0dc5731677c68 | |
| parent | f89d67c4caf529ffdfaffa57eed7e59e82410e33 (diff) | |
| download | drakx-90454d65291b4f33913880d179ae5439e386c7fa.tar drakx-90454d65291b4f33913880d179ae5439e386c7fa.tar.gz drakx-90454d65291b4f33913880d179ae5439e386c7fa.tar.bz2 drakx-90454d65291b4f33913880d179ae5439e386c7fa.tar.xz drakx-90454d65291b4f33913880d179ae5439e386c7fa.zip | |
do not try to mount the partition in testing mode, assume it is already mounted
| -rw-r--r-- | mdk-stage1/disk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index c0c964800..3d47bc595 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -234,7 +234,8 @@ static enum return_type try_with_device(char *dev_name) return results; } - if (try_mount(choice, disk_own_mount)) { + /* in testing mode, assume the partition is already mounted on SLASH_LOCATION "/tmp/hdimage" */ + if (!IS_TESTING && try_mount(choice, disk_own_mount)) { stg1_error_message("I can't find a valid filesystem (tried: ext2, vfat, ntfs, reiserfs)."); return try_with_device(dev_name); } |