summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 11:27:58 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 11:27:58 +0100
commitff1e4b0626d8ce567492ccadbd30dfc32d4c15f1 (patch)
treebcc69dfac4fbf2c7ffc4b903214f6f88b15dfbdc /methods
parentbf783d9044cb5c9e851fbf10c9bb7e6192b13afd (diff)
add new "Acquire::cdrom::AutoDetect" variable that enables/disables
the dlopen of libudev for automatic cdrom detection
Diffstat (limited to 'methods')
-rw-r--r--methods/cdrom.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 763547013..87794b052 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", true);
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))