From c9952021ba65db0581f6053cd6d6e8bf7d563e8f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Mar 2011 11:13:44 +0100
Subject: * apt-pkg/contrib/cdromutl.{cc,h}, apt-pkg/cdrom.{cc,h}:   - deal
 with missing FSTAB_DIR when using libudev to discover cdrom   - add
 experimental APT::cdrom::CdromOnly option (on by default).     When this is
 set to false apt-cdrom will handle any removable     deivce (like a
 usb-stick) as a "cdrom/dvd" source

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

(limited to 'apt-pkg/cdrom.cc')

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 83438f1c4..55600fe57 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -875,7 +875,8 @@ pkgUdevCdromDevices::Dlopen()                     		        /*{{{*/
 vector<CdromDevice>
 pkgUdevCdromDevices::Scan()
 { 
-   return ScanForRemovable(true); 
+   bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true);
+   return ScanForRemovable(CdromOnly); 
 };
 									/*}}}*/
                                                                         /*{{{*/
-- 
cgit v1.2.3