* 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()

4 files changed, 84 insertions, 21 deletions

diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index b6524a178..0cf9697ac 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -98,7 +98,7 @@ bool UnmountCdrom(string Path)
 // MountCdrom - Mount a cdrom						/*{{{*/
 // ---------------------------------------------------------------------
 /* We fork mount and drop all messages */
-bool MountCdrom(string Path)
+bool MountCdrom(string Path, string DeviceName)
 {
    if (IsMounted(Path) == true)
       return true;
@@ -122,8 +122,15 @@ bool MountCdrom(string Path)
       {
 	 const char *Args[10];
 	 Args[0] = "mount";
-	 Args[1] = Path.c_str();
-	 Args[2] = 0;
+	 if (DeviceName == "") 
+	 {
+	    Args[1] = Path.c_str();
+	    Args[2] = 0;
+	 } else {
+	    Args[1] = DeviceName.c_str();
+	    Args[2] = Path.c_str();
+	    Args[3] = 0;
+	 }
 	 execvp(Args[0],(char **)Args);      
 	 _exit(100);
       }      
diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index f24bb8c70..9d14249c5 100644
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -14,7 +14,8 @@
 
 using std::string;
 
-bool MountCdrom(string Path);
+// mount cdrom, DeviceName (e.g. /dev/sr0) is optional
+bool MountCdrom(string Path, string DeviceName="");
 bool UnmountCdrom(string Path);
 bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
 bool IsMounted(string &Path);
diff --git a/debian/changelog b/debian/changelog
index 65fd9e590..cce7fc0f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.22) unstable; urgency=low
+
+  * add Acquire::Cdrom::mount "apt-udev-auto" magic to allow
+    dynamically finding the cdrom device
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Jul 2009 18:00:53 +0200
+
 apt (0.7.21) UNRELEASED; urgency=low
 
   [ Osamu Aoki ]
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?