From bca4c203ac8664f7cdbffd4ce8474b358f708658 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 26 Jan 2010 11:49:29 +0100
Subject: add new "Acquire::cdrom::AutoDetect" config that enables/disables the
 dlopen of libudev for automatic cdrom detection. Off by default currently,
 feedback/testing welcome

---
 methods/cdrom.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'methods')

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index b0f1a1551..b3f461816 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -218,6 +218,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       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;
@@ -228,7 +229,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    string NewID;
    while (CurrentID.empty() == true)
    {
-      if (CDROM == "apt-udev-auto/") 
+      if (AutoDetect)
 	 AutoDetectAndMount(Get, NewID);
 
       if(!IsMounted(CDROM))
-- 
cgit v1.2.3