diff options
| author | Michael Vogt <mvo@debian.org> | 2011-02-01 15:51:29 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2011-02-01 15:51:29 +0100 |
| commit | 710aba4a9c0edd415e5daabb497ee8fffe803a96 (patch) | |
| tree | 67afe35cc291548d7a636cc00c7375c7b2fb51b4 /apt-pkg/cdrom.cc | |
| parent | c3a3640cabcc64a7479fadd96b2f2af255d721c9 (diff) | |
* apt-pkg/cdrom.cc, apt-pkg/init.cc, methods/cdrom.cc:
- use /media/cdrom as default mountoint (closes: #611569)
Diffstat (limited to 'apt-pkg/cdrom.cc')
| -rw-r--r-- | apt-pkg/cdrom.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 0e36f44a2..124410b11 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -198,7 +198,7 @@ int pkgCdrom::Score(string Path) // a symlink gets a big penalty struct stat Buf; string statPath = flNotFile(Path); - string cdromPath = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); + string cdromPath = _config->FindDir("Acquire::cdrom::mount"); while(statPath != cdromPath && statPath != "./") { statPath.resize(statPath.size()-1); // remove the trailing '/' if (lstat(statPath.c_str(),&Buf) == 0) { @@ -509,7 +509,7 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ stringstream msg; // Startup - string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); + string CDROM = _config->FindDir("Acquire::cdrom::mount"); if (CDROM[0] == '.') CDROM= SafeGetCWD() + '/' + CDROM; |