diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-10 11:13:44 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-10 11:13:44 +0100 |
| commit | c9952021ba65db0581f6053cd6d6e8bf7d563e8f (patch) | |
| tree | 01065683f59fc1eb8ddc025d79a26fdf31a8623e /apt-pkg | |
| parent | 02aa6f67360bbd8f15c29fb0701badda99fc8c75 (diff) | |
* 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
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/cdrom.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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); }; /*}}}*/ /*{{{*/ |