merge 'after squeeze release'-stuff

[apt.git] / apt-pkg / init.cc

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 734f5b2c442ac3ea1b1d1c7602e4be3e9a6f6073..a30f278441ff4ff9b5840a4719ac529ab757acb2 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -52,7 +52,7 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::State::lists","lists/");
    Cnf.Set("Dir::State::cdroms","cdroms.list");
    Cnf.Set("Dir::State::mirrors","mirrors/");
    Cnf.Set("Dir::State::lists","lists/");
    Cnf.Set("Dir::State::cdroms","cdroms.list");
    Cnf.Set("Dir::State::mirrors","mirrors/");

-   
+

    // Cache
    Cnf.Set("Dir::Cache","var/cache/apt/");
    Cnf.Set("Dir::Cache::archives","archives/");
    // Cache
    Cnf.Set("Dir::Cache","var/cache/apt/");
    Cnf.Set("Dir::Cache::archives","archives/");


@@ -88,6 +88,9 @@ bool pkgInitConfig(Configuration &Cnf)
    // Translation
    Cnf.Set("APT::Acquire::Translation", "environment");
 
    // Translation
    Cnf.Set("APT::Acquire::Translation", "environment");
 

+   // Default cdrom mount point
+   Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/");
+

    bool Res = true;
    
    // Read an alternate config file
    bool Res = true;
    
    // Read an alternate config file