diff options
| -rw-r--r-- | apt-pkg/cdrom.cc | 3 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/examples/configure-index | 5 |
3 files changed, 11 insertions, 2 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); }; /*}}}*/ /*{{{*/ diff --git a/debian/changelog b/debian/changelog index ff5675a0c..fba168110 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,11 @@ apt (0.8.12) UNRELEASED; urgency=low to Thorsten Spindler (LP: #85590) * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc: - honor Dpkg::Chroot-Directory in the RunScripts*() methods + * 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 -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Feb 2011 17:37:56 +0100 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 03a37287d..6884e06e3 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -265,7 +265,10 @@ Acquire cdrom { // do auto detection of the cdrom mountpoint - AutoDetect "true"; + AutoDetect "true"; + // when auto-detecting, only look for cdrom/dvd. when this is false + // it will support any removable device as a "cdrom" source + CdromOnly "true"; // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used) mount "/cdrom"; |