##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include <apt-pkg/acquire-method.h>
+#include <config.h>
+
+#include <apt-pkg/cdrom.h>
#include <apt-pkg/cdromutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/hashes.h>
+
+#include "aptmethod.h"
+#include <string>
+#include <vector>
#include <sys/stat.h>
-#include <unistd.h>
#include <iostream>
#include <apti18n.h>
using namespace std;
-class CDROMMethod : public pkgAcqMethod
+class CDROMMethod : public aptMethod
{
bool DatabaseLoaded;
+ bool Debug;
+
::Configuration Database;
string CurrentID;
string CDROM;
- bool Mounted;
-
- virtual bool Fetch(FetchItem *Itm);
+ bool MountedByApt;
+ pkgUdevCdromDevices UdevCdroms;
+
+ bool IsCorrectCD(URI want, string MountPath, string& NewID);
+ bool AutoDetectAndMount(const URI, string &NewID);
+ virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
string GetID(string Name);
- virtual void Exit();
-
+ virtual void Exit() APT_OVERRIDE;
+
public:
CDROMMethod();
// CDROMMethod::CDROMethod - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
+CDROMMethod::CDROMMethod() : aptMethod("cdrom", "1.0",SingleInstance | LocalOnly |
SendConfig | NeedsCleanup |
- Removable),
- DatabaseLoaded(false),
- Mounted(false)
+ Removable),
+ DatabaseLoaded(false),
+ Debug(false),
+ MountedByApt(false)
{
-};
+ UdevCdroms.Dlopen();
+}
/*}}}*/
// CDROMMethod::Exit - Unmount the disc if necessary /*{{{*/
// ---------------------------------------------------------------------
/* */
void CDROMMethod::Exit()
-{
- if (Mounted == true)
+{
+ if (MountedByApt == true)
UnmountCdrom(CDROM);
}
/*}}}*/
return string();
}
/*}}}*/
+// CDROMMethod::AutoDetectAndMount /*{{{*/
+// ---------------------------------------------------------------------
+/* Modifies class varaiable CDROM to the mountpoint */
+bool CDROMMethod::AutoDetectAndMount(const URI Get, string &NewID)
+{
+ vector<struct CdromDevice> v = UdevCdroms.Scan();
+
+ // first check if its mounted somewhere already
+ for (unsigned int i=0; i < v.size(); i++)
+ {
+ if (v[i].Mounted)
+ {
+ if (Debug)
+ clog << "Checking mounted cdrom device " << v[i].DeviceName << endl;
+ if (IsCorrectCD(Get, v[i].MountPath, NewID))
+ {
+ CDROM = v[i].MountPath;
+ return true;
+ }
+ }
+ }
+
+ // we are not supposed to mount, exit
+ if (_config->FindB("APT::CDROM::NoMount",false) == true)
+ return false;
+
+ // check if we have the mount point
+ 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(AptMountPoint, v[i].DeviceName))
+ {
+ if (IsCorrectCD(Get, AptMountPoint, NewID))
+ {
+ MountedByApt = true;
+ CDROM = AptMountPoint;
+ return true;
+ } else {
+ UnmountCdrom(AptMountPoint);
+ }
+ }
+ }
+ }
+
+ return false;
+}
+ /*}}}*/
+// CDROMMethod::IsCorrectCD /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath, string& NewID)
+{
+ for (unsigned int Version = 2; Version != 0; Version--)
+ {
+ if (IdentCdrom(MountPath,NewID,Version) == false)
+ return false;
+
+ if (Debug)
+ clog << "ID " << Version << " " << NewID << endl;
+
+ // A hit
+ if (Database.Find("CD::" + NewID) == want.Host)
+ return true;
+ }
+
+ return false;
+}
+ /*}}}*/
// CDROMMethod::Fetch - Fetch a file /*{{{*/
// ---------------------------------------------------------------------
/* */
bool CDROMMethod::Fetch(FetchItem *Itm)
{
+ FetchResult Res;
+
URI Get = Itm->Uri;
string File = Get.Path;
- FetchResult Res;
+ Debug = DebugEnabled();
- bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+ if (Debug)
+ clog << "CDROMMethod::Fetch " << Itm->Uri << endl;
/* All IMS queries are returned as a hit, CDROMs are readonly so
time stamps never change */
{
Res.LastModified = Itm->LastModified;
Res.IMSHit = true;
- Res.Filename = File;
+ Res.Filename = Itm->DestFile;
URIDone(Res);
return true;
}
// All non IMS queries for package files fail.
if (Itm->IndexFile == true || GetID(Get.Host).empty() == true)
{
- Fail(_("Please use apt-cdrom to make this CD recognized by APT."
- " apt-get update cannot be used to add new CDs"));
+ Fail(_("Please use apt-cdrom to make this CD-ROM recognized by APT."
+ " apt-get update cannot be used to add new CD-ROMs"));
return true;
}
// We already have a CD inserted, but it is the wrong one
- if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
+ if (CurrentID.empty() == false &&
+ CurrentID != "FAIL" &&
+ Database.Find("CD::" + CurrentID) != Get.Host)
{
- Fail(_("Wrong CD"),true);
+ Fail(_("Wrong CD-ROM"),true);
return true;
}
-
- CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+
+ bool const AutoDetect = ConfigFindB("AutoDetect", true);
+ CDROM = _config->FindDir("Acquire::cdrom::mount");
+ if (Debug)
+ clog << "Looking for CDROM at " << CDROM << endl;
+
if (CDROM[0] == '.')
CDROM= SafeGetCWD() + '/' + CDROM;
+
string NewID;
while (CurrentID.empty() == true)
{
- bool Hit = false;
- Mounted = MountCdrom(CDROM);
- for (unsigned int Version = 2; Version != 0; Version--)
- {
- if (IdentCdrom(CDROM,NewID,Version) == false)
- return false;
-
- if (Debug == true)
- clog << "ID " << Version << " " << NewID << endl;
-
- // A hit
- if (Database.Find("CD::" + NewID) == Get.Host)
- {
- Hit = true;
- break;
- }
- }
+ if (AutoDetect)
+ AutoDetectAndMount(Get, NewID);
- if (Hit == true)
+ if(!IsMounted(CDROM))
+ MountedByApt = MountCdrom(CDROM);
+
+ if (IsCorrectCD(Get, CDROM, NewID))
break;
// I suppose this should prompt somehow?
- if (UnmountCdrom(CDROM) == false)
+ if (_config->FindB("APT::CDROM::NoMount",false) == false &&
+ UnmountCdrom(CDROM) == false)
return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."),
CDROM.c_str());
if (MediaFail(Get.Host,CDROM) == false)
{
CurrentID = "FAIL";
- Fail(_("Wrong CD"),true);
- return true;
+ return _error->Error(_("Disk not found."));
}
}
struct stat Buf;
if (stat(Res.Filename.c_str(),&Buf) != 0)
return _error->Error(_("File not found"));
-
+
+ URIStart(Res);
if (NewID.empty() == false)
CurrentID = NewID;
Res.LastModified = Buf.st_mtime;
Res.Size = Buf.st_size;
+
+ Hashes Hash(Itm->ExpectedHashes);
+ FileFd Fd(Res.Filename, FileFd::ReadOnly);
+ Hash.AddFD(Fd);
+ Res.TakeHashes(Hash);
+
URIDone(Res);
return true;
}
int main()
{
- setlocale(LC_ALL, "");
-
- CDROMMethod Mth;
- return Mth.Run();
+ _config->CndSet("Binary::cdrom::Debug::NoDropPrivs", true);
+ return CDROMMethod().Run();
}
projects / apt.git / blobdiff