X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/1c5459803004d04d09ff6674b25155db39e71037..0a64ecd792b4caca519d597a69b8baeda6a1bf77:/methods/cdrom.cc?ds=inline diff --git a/methods/cdrom.cc b/methods/cdrom.cc index b0f1a1551..ae699dfc3 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -54,7 +54,8 @@ class CDROMMethod : public pkgAcqMethod CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | SendConfig | NeedsCleanup | Removable), - DatabaseLoaded(false), + DatabaseLoaded(false), + Debug(false), MountedByApt(false) { UdevCdroms.Dlopen(); @@ -116,23 +117,24 @@ bool CDROMMethod::AutoDetectAndMount(const 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); } } } @@ -218,7 +220,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) return true; } - CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); + CDROM = _config->FindDir("Acquire::cdrom::mount"); if (Debug) clog << "Looking for CDROM at " << CDROM << endl; @@ -228,7 +231,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) string NewID; while (CurrentID.empty() == true) { - if (CDROM == "apt-udev-auto/") + if (AutoDetect) AutoDetectAndMount(Get, NewID); if(!IsMounted(CDROM))