doc/apt-get.8.xml: document download

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index c8ec322ee9b6b716c9a34b9f43d006334791bbb1..bf4281e403586a9ef73838d49e780ac49de34df6 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -38,7 +38,7 @@ class CDROMMethod : public pkgAcqMethod
    pkgUdevCdromDevices UdevCdroms;
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);
-   bool AutoDetectAndMount(URI, string &NewID);
+   bool AutoDetectAndMount(const URI, string &NewID);
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    virtual void Exit();
@@ -92,7 +92,7 @@ string CDROMMethod::GetID(string Name)
 // CDROMMethod::AutoDetectAndMount                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* Modifies class varaiable CDROM to the mountpoint */
-bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
+bool CDROMMethod::AutoDetectAndMount(const URI Get, string &NewID)
 {
    vector<struct CdromDevice> v = UdevCdroms.Scan();
 
@@ -116,9 +116,9 @@ bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
       return false;
 
    // check if we have the mount point
-   const char* AptMountPoint = "/media/apt";
+   string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
    if (!FileExists(AptMountPoint))
-      mkdir(AptMountPoint, 0750);
+      mkdir(AptMountPoint.c_str(), 0750);
 
    // now try mounting
    for (unsigned int i=0; i < v.size(); i++)