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

the dlopen of libudev for automatic cdrom detection. Off by default
currently, feedback/testing welcome

diff --git a/debian/changelog b/debian/changelog
index 39798f6351cc2f486f6a3c715b92ad4bf75faf79..388078f2b0702429bdc66155b7482f274c393588 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ apt (0.7.25.2) 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" config that enables/disables
+      the dlopen of libudev for automatic cdrom detection. Off by default
+      currently, feedback/testing welcome

   * cmdline/apt-mark:
     - merge fix from Gene Cash that supports markauto for
       packages that are not in the extended_states file yet
   * cmdline/apt-mark:
     - merge fix from Gene Cash that supports markauto for
       packages that are not in the extended_states file yet

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index b0f1a1551b0c179294ed2a492ca9f09fb7340162..b3f4618165ae8c3c4cf3f5b1c68481d9c2f812ab 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", false);

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