add new "Acquire::cdrom::AutoDetect" variable that enables/disables

the dlopen of libudev for automatic cdrom detection

diff --git a/debian/changelog b/debian/changelog
index b499d729837a13020cc9ba60841cc4a43a489fe1..7e38cda9985964fddf1c77399ff743fdcde92009 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ apt (0.7.25.1) UNRELEASED; urgency=low
       the umount again
   * methods/cdrom.cc:
     - fixes in multi cdrom setup code
       the umount again
   * methods/cdrom.cc:
     - fixes in multi cdrom setup code

+    - add new "Acquire::cdrom::AutoDetect" variable that enables/disables
+      the dlopen of libudev for automatic cdrom detection

 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100
 

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 1e9946e1b65c18c2f0fef1e3a5c580e9439c47a6..317acddf66ee05bda93cd56e59834464310fa711 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -250,6 +250,10 @@ Acquire
   
   cdrom
   {
   
   cdrom
   {

+    // do auto detection of the cdrom mountpoint
+    AutoDetect "true";
+    
+    // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)

     mount "/cdrom";
 
     // You need the trailing slash!
     mount "/cdrom";
 
     // You need the trailing slash!

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 7635470134c6d41a9eb68da010b1551b44d7eb03..87794b052a08b3da087ab053b424b63723c922e7 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -218,6 +218,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       return true;
    }
 
       return true;
    }
 

+   bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);

    CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
    if (Debug)
       clog << "Looking for CDROM at " << CDROM << endl;
    CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
    if (Debug)
       clog << "Looking for CDROM at " << CDROM << endl;


@@ -228,7 +229,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    string NewID;
    while (CurrentID.empty() == true)
    {
    string NewID;
    while (CurrentID.empty() == true)
    {

-      if (CDROM == "apt-udev-auto/") 
+      if (AutoDetect)

         AutoDetectAndMount(Get, NewID);
 
       if(!IsMounted(CDROM))
         AutoDetectAndMount(Get, NewID);
 
       if(!IsMounted(CDROM))