* methods/cdrom.cc:

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index d6b8eae75c0dd4d6c810f0ab720b997c09dfdb76..cd0d4e5120dd2d5b50d3fe05ecd6d39d7d9d0653 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -9,6 +9,7 @@
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/acquire-method.h>
                                                                        /*}}}*/
 // 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>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>


@@ -17,6 +18,7 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
 #include <unistd.h>

+#include <dlfcn.h>

 
 #include <iostream>
 #include <apti18n.h>
 
 #include <iostream>
 #include <apti18n.h>


@@ -30,12 +32,13 @@ class CDROMMethod : public pkgAcqMethod
    ::Configuration Database;
    string CurrentID;
    string CDROM;
    ::Configuration Database;
    string CurrentID;
    string CDROM;

-   bool Mounted;
-   
+   bool MountedByApt;
+ 
+   bool IsCorrectCD(URI want, string MountPath);

    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    virtual void Exit();
    virtual bool Fetch(FetchItem *Itm);
    string GetID(string Name);
    virtual void Exit();

-   
+      

    public:
    
    CDROMMethod();
    public:
    
    CDROMMethod();


@@ -48,16 +51,18 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                          SendConfig | NeedsCleanup |
                                          Removable), 
                                           DatabaseLoaded(false), 
                                          SendConfig | NeedsCleanup |
                                          Removable), 
                                           DatabaseLoaded(false), 

-                                          Mounted(false)
+                                          MountedByApt(false)

 {
 {

+
+

 };
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void CDROMMethod::Exit()
 };
                                                                        /*}}}*/
 // CDROMMethod::Exit - Unmount the disc if necessary                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 void CDROMMethod::Exit()

-{
-   if (Mounted == true)
+{ 
+  if (MountedByApt == true)

       UnmountCdrom(CDROM);
 }
                                                                        /*}}}*/
       UnmountCdrom(CDROM);
 }
                                                                        /*}}}*/


@@ -81,6 +86,31 @@ string CDROMMethod::GetID(string Name)
    return string();
 }
                                                                        /*}}}*/
    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                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::Fetch - Fetch a file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -131,36 +161,59 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       Fail(_("Wrong CD-ROM"),true);
       return true;
    }
       Fail(_("Wrong CD-ROM"),true);
       return true;
    }

-   
+

    CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
    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;
    while (CurrentID.empty() == true)
    {
       bool Hit = false;
    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;
+      if(!IsMounted(CDROM))
+        MountedByApt = MountCdrom(CDROM);

       
       

-        // 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?
         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)
         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)