summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 21:17:13 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 21:17:13 +0100
commit89504deb355453e2022cafe54b3b235588bea7d7 (patch)
tree446f42f046cfede427be6cfa6d24fc173ac43e7b /methods
parent6571bee2e2289b3a183ae3a922551eb743839392 (diff)
parentffee221b8d1df28768d30762d72a11289ae747dc (diff)
merged from the lp:~mvo/apt/libudev-dlopen branch
Diffstat (limited to 'methods')
-rw-r--r--methods/cdrom.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 0e78851ff..4bbc01c2c 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -116,23 +116,24 @@ bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
return false;
// check if we have the mount point
- if (!FileExists("/media/apt"))
- mkdir("/media/apt", 0755);
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint.c_str(), 0750);
// now try mounting
for (unsigned int i=0; i < v.size(); i++)
{
if (!v[i].Mounted)
{
- if(MountCdrom("/media/apt", v[i].DeviceName))
+ if(MountCdrom(AptMountPoint, v[i].DeviceName))
{
- if (IsCorrectCD(Get, "/media/apt", NewID))
+ if (IsCorrectCD(Get, AptMountPoint, NewID))
{
MountedByApt = true;
- CDROM = "/media/apt";
+ CDROM = AptMountPoint;
return true;
} else {
- UnmountCdrom("/media/apt");
+ UnmountCdrom(AptMountPoint);
}
}
}