summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-17 07:42:35 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-17 07:42:35 +0000
commit9ef2e6a642f5a5bf89a7e18a6e000535c395c1fb (patch)
treed7504b279aa33f3e47558ba23f54482163ffbe61
parentf2d7d99cac5d7b662bd61139de0bc14653b801a2 (diff)
downloaddrakx-9ef2e6a642f5a5bf89a7e18a6e000535c395c1fb.tar
drakx-9ef2e6a642f5a5bf89a7e18a6e000535c395c1fb.tar.gz
drakx-9ef2e6a642f5a5bf89a7e18a6e000535c395c1fb.tar.bz2
drakx-9ef2e6a642f5a5bf89a7e18a6e000535c395c1fb.tar.xz
drakx-9ef2e6a642f5a5bf89a7e18a6e000535c395c1fb.zip
do not delete loopbacks devices before umount but after
-rw-r--r--mdk-stage1/disk.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index 83ec0ae01..1dfc48741 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -353,14 +353,14 @@ 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));
- del_loop(loopdev);
umount(disk_own_mount);
+ del_loop(loopdev);
return try_with_device(dev_name);
}
if (load_ramdisk() != RETURN_OK) {
stg1_error_message("Could not load program into memory.");
- del_loop(loopdev);
umount(disk_own_mount);
+ del_loop(loopdev);
return try_with_device(dev_name);
}
} else {
@@ -375,8 +375,8 @@ 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));
- del_loop(loopdev);
umount(disk_own_mount);
+ del_loop(loopdev);
return try_with_device(dev_name);
}
#ifndef MANDRAKE_MOVE
@@ -385,8 +385,8 @@ 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.");
- del_loop(loopdev);
umount(disk_own_mount);
+ del_loop(loopdev);
return try_with_device(dev_name);
}
log_message("found the " DISTRIB_NAME " Installation, good news!");
@@ -394,8 +394,8 @@ static enum return_type try_with_device(char *dev_name)
#endif
if (IS_RESCUE) {
- del_loop(loopdev);
umount(disk_own_mount);
+ del_loop(loopdev);
}
add_to_env("METHOD", "disk");