diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-10-22 19:15:42 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-10-22 19:15:42 +0000 |
| commit | 559e1418f2c89f5cfd50c9cb6c21865abfa22ae3 (patch) | |
| tree | 6ff330de1af888bd25b1e90e43d68e961f83bf57 /mdk-stage1/disk.c | |
| parent | 4a5604021581abcbf0d9c8c5eb88f18cfb1c83df (diff) | |
| download | drakx-559e1418f2c89f5cfd50c9cb6c21865abfa22ae3.tar drakx-559e1418f2c89f5cfd50c9cb6c21865abfa22ae3.tar.gz drakx-559e1418f2c89f5cfd50c9cb6c21865abfa22ae3.tar.bz2 drakx-559e1418f2c89f5cfd50c9cb6c21865abfa22ae3.tar.xz drakx-559e1418f2c89f5cfd50c9cb6c21865abfa22ae3.zip | |
allow more than one loop device for more than one lomount
Diffstat (limited to 'mdk-stage1/disk.c')
| -rw-r--r-- | mdk-stage1/disk.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index 9dff3d184..2dcaad2b8 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -206,13 +206,14 @@ static enum return_type try_with_device(char *dev_name) char location_full[500]; char * disk_own_mount = "/tmp/hdimage"; + char * loopdev = NULL; char * parts[50]; char * parts_comments[50]; struct stat statbuf; enum return_type results; char * choice; - + if (list_partitions(dev_name, parts, parts_comments)) { stg1_error_message("Could not read partitions information."); return RETURN_ERROR; @@ -255,7 +256,7 @@ static enum return_type try_with_device(char *dev_name) 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, 0)) { + if (lomount(location_full, IMAGE_LOCATION, &loopdev, 0)) { stg1_error_message("Could not mount file %s as an ISO image of the " DISTRIB_NAME " Distribution.", answers_location[0]); umount(disk_own_mount); return try_with_device(dev_name); @@ -270,13 +271,13 @@ static enum return_type try_with_device(char *dev_name) "(I need the subdirectory " RAMDISK_LOCATION ")\n" "Here's a short extract of the files in the directory:\n" "%s", disk_extract_list_directory(IMAGE_LOCATION)); - loumount(); + del_loop(loopdev); umount(disk_own_mount); return try_with_device(dev_name); } if (load_ramdisk() != RETURN_OK) { stg1_error_message("Could not load program into memory."); - loumount(); + del_loop(loopdev); umount(disk_own_mount); return try_with_device(dev_name); } @@ -288,7 +289,7 @@ static enum return_type try_with_device(char *dev_name) "(I need the subdirectory " LIVE_LOCATION ")\n" "Here's a short extract of the files in the directory:\n" "%s", disk_extract_list_directory(IMAGE_LOCATION)); - loumount(); + del_loop(loopdev); umount(disk_own_mount); return try_with_device(dev_name); } @@ -296,7 +297,7 @@ static enum return_type try_with_device(char *dev_name) stg1_error_message("The " DISTRIB_NAME " Distribution seems to be copied on a Windows partition. " "You need more memory to perform an installation from a Windows partition. " "Another solution if to copy the " DISTRIB_NAME " Distribution on a Linux partition."); - loumount(); + del_loop(loopdev); umount(disk_own_mount); return try_with_device(dev_name); } @@ -304,7 +305,7 @@ static enum return_type try_with_device(char *dev_name) } if (IS_RESCUE) { - loumount(); + del_loop(loopdev); umount(disk_own_mount); } |