};
/*}}}*/
// SetupAutoDetect /*{{{*/
-bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, int &i)
+bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
{
bool Debug = _config->FindB("Debug::Acquire::cdrom", false);
_config->Set("Acquire::cdrom::mount", v[i].MountPath);
_config->Set("APT::CDROM::NoMount", true);
} else {
- MountCdrom("/var/lib/apt/media", v[i].DeviceName);
- MountCdrom("/var/lib/apt/media", v[i].DeviceName);
- _config->Set("Acquire::cdrom::mount", "/var/lib/apt/media");
+ const char* AptMountPoint = "/media/apt";
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint, 0750);
+ if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
+ _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint);
+ _config->Set("Acquire::cdrom::mount", AptMountPoint);
_config->Set("APT::CDROM::NoMount", true);
}
i++;
pkgUdevCdromDevices UdevCdroms;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- bool res = false;
+ bool res = true;
bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
- int count = 0;
+ unsigned int count = 0;
if (AutoDetect && UdevCdroms.Dlopen())
{
bool res = true;
bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
- int count = 0;
+ unsigned int count = 0;
if (AutoDetect && UdevCdroms.Dlopen())
{
return false;
// check if we have the mount point
- if (!FileExists("/media/apt"))
- mkdir("/media/apt", 0755);
+ const char* AptMountPoint = "/media/apt";
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint, 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);
}
}
}