summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-07-22 18:01:43 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-07-22 18:01:43 +0200
commita6418a4b93376e0e4acf36e88eb1d0ec41e024df (patch)
tree9c6b5936266036735bde19f2a13a53bc396dc577 /methods
parentbe5b558134ade780e11f50dede99d041a1defd7f (diff)
* methods/cdrom.cc:
- add Acquire::Cdrom::mount "apt-udev-auto" magic to allow dynamically finding the cdrom device * apt-pkg/contrib/cdromutl.{h,cc}: - support additional (optional) DeviceName parameter for MountCdrom()
Diffstat (limited to 'methods')
-rw-r--r--methods/cdrom.cc82
1 files changed, 65 insertions, 17 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 7a20ae514..cd0d4e512 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -9,6 +9,7 @@
/*}}}*/
// Include Files /*{{{*/
#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/cdrom.h>
#include <apt-pkg/cdromutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
@@ -33,6 +34,7 @@ class CDROMMethod : public pkgAcqMethod
string CDROM;
bool MountedByApt;
+ bool IsCorrectCD(URI want, string MountPath);
virtual bool Fetch(FetchItem *Itm);
string GetID(string Name);
virtual void Exit();
@@ -84,6 +86,31 @@ string CDROMMethod::GetID(string Name)
return string();
}
/*}}}*/
+
+// CDROMMethod::IsCorrectCD /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CDROMMethod::IsCorrectCD(URI want, string MountPath)
+{
+ bool Debug = _config->FindB("Debug::Acquire::cdrom",false);
+ string NewID;
+
+ for (unsigned int Version = 2; Version != 0; Version--)
+ {
+ if (IdentCdrom(MountPath,NewID,Version) == false)
+ return false;
+
+ if (Debug == true)
+ clog << "ID " << Version << " " << NewID << endl;
+
+ // A hit
+ if (Database.Find("CD::" + NewID) == want.Host)
+ return true;
+ }
+
+ return false;
+}
+ /*}}}*/
// CDROMMethod::Fetch - Fetch a file /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -134,8 +161,44 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
Fail(_("Wrong CD-ROM"),true);
return true;
}
-
+
CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+
+ // auto-detect mode
+ if (CDROM == "apt-udev-auto/")
+ {
+ pkgUdevCdromDevices udev;
+ if(udev.Dlopen())
+ {
+ vector<struct CdromDevice> v = udev.Scan();
+ for (unsigned int i=0; i < v.size(); i++)
+ {
+ if (!v[i].Mounted)
+ {
+ if (!FileExists("/media/apt"))
+ mkdir("/media/apt", 0755);
+ if(MountCdrom("/media/apt", v[i].DeviceName))
+ {
+ if (IsCorrectCD(Get, "/media/apt"))
+ {
+ MountedByApt = true;
+ CDROM = "/media/apt";
+ break;
+ } else {
+ UnmountCdrom("/media/apt");
+ }
+ }
+ } else {
+ if (IsCorrectCD(Get, v[i].MountPath))
+ {
+ CDROM = v[i].MountPath;
+ break;
+ }
+ }
+ }
+ }
+ }
+
if (CDROM[0] == '.')
CDROM= SafeGetCWD() + '/' + CDROM;
string NewID;
@@ -144,23 +207,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
bool Hit = false;
if(!IsMounted(CDROM))
MountedByApt = 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 (Hit == true)
+ if (IsCorrectCD(Get, CDROM))
break;
// I suppose this should prompt somehow?