summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/init.cc3
-rw-r--r--cmdline/apt-cdrom.cc6
-rw-r--r--doc/examples/configure-index7
-rw-r--r--methods/cdrom.cc4
4 files changed, 14 insertions, 6 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 2544b8025..6310aff11 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -65,11 +65,12 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
- Cnf.Set("Dir::ETc::netrc", "auth.conf");
+ Cnf.Set("Dir::Etc::netrc", "auth.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+ Cnf.Set("Dir::Media::MountPath","/media/apt");
// State
Cnf.Set("Dir::Log","var/log/apt");
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 494a7d8df..988a58f20 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -120,11 +120,11 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
_config->Set("Acquire::cdrom::mount", v[i].MountPath);
_config->Set("APT::CDROM::NoMount", true);
} else {
- const char* AptMountPoint = "/media/apt";
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
if (!FileExists(AptMountPoint))
- mkdir(AptMountPoint, 0750);
+ mkdir(AptMountPoint.c_str(), 0750);
if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
- _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint);
+ _error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str());
_config->Set("Acquire::cdrom::mount", AptMountPoint);
_config->Set("APT::CDROM::NoMount", true);
}
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 317acddf6..0b0025fca 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -331,6 +331,13 @@ Dir "/"
Terminal "term.log";
History "history.log";
};
+
+ // Media
+ Media
+ {
+ // Media AutoDetect mount path
+ MountPath "/media/apt";
+ };
};
// Things that effect the APT dselect method
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index c8ec322ee..4bbc01c2c 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -116,9 +116,9 @@ bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
return false;
// check if we have the mount point
- const char* AptMountPoint = "/media/apt";
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
if (!FileExists(AptMountPoint))
- mkdir(AptMountPoint, 0750);
+ mkdir(AptMountPoint.c_str(), 0750);
// now try mounting
for (unsigned int i=0; i < v.size(); i++)