summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 21:23:30 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 21:23:30 +0100
commit6e97e817f1082bc98a8f8bf4830d4e3a3bebfb61 (patch)
tree3c549f514b813f3433288ddaf6541660347bf1e6
parent25ee65dd5155fda6dd3754d091b86acb5d7bd9dc (diff)
parentffee221b8d1df28768d30762d72a11289ae747dc (diff)
merged the latest lp:~mvo/apt/libudev-cdrom branch
-rw-r--r--apt-pkg/cdrom.cc2
-rw-r--r--apt-pkg/init.cc3
-rw-r--r--cmdline/apt-cdrom.cc70
-rw-r--r--debian/apt.dirs1
-rw-r--r--doc/examples/configure-index7
-rw-r--r--methods/cdrom.cc13
6 files changed, 84 insertions, 12 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 3467f49d7..96d4e9c91 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -829,8 +829,6 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
}
}
-
-
// Unmount and finish
if (_config->FindB("APT::CDROM::NoMount",false) == false) {
log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
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 d804c55e5..988a58f20 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -98,6 +98,42 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
return &Progress;
};
/*}}}*/
+// SetupAutoDetect /*{{{*/
+bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
+{
+ bool Debug = _config->FindB("Debug::Acquire::cdrom", false);
+
+ vector<struct CdromDevice> v = UdevCdroms.Scan();
+ if (i >= v.size())
+ return false;
+
+ if (Debug)
+ clog << "Looking at devce " << i
+ << " DeviveName: " << v[i].DeviceName
+ << " IsMounted: '" << v[i].Mounted << "'"
+ << " MountPoint: '" << v[i].MountPath << "'"
+ << endl;
+
+ if (v[i].Mounted)
+ {
+ // set the right options
+ _config->Set("Acquire::cdrom::mount", v[i].MountPath);
+ _config->Set("APT::CDROM::NoMount", true);
+ } else {
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ if (!FileExists(AptMountPoint))
+ 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.c_str());
+ _config->Set("Acquire::cdrom::mount", AptMountPoint);
+ _config->Set("APT::CDROM::NoMount", true);
+ }
+ i++;
+
+ return true;
+}
+ /*}}}*/
+
// DoAdd - Add a new CDROM /*{{{*/
// ---------------------------------------------------------------------
/* This does the main add bit.. We show some status and things. The
@@ -106,12 +142,25 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
verify them. Then rewrite the database files */
bool DoAdd(CommandLine &)
{
- bool res = false;
+ pkgUdevCdromDevices UdevCdroms;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- res = cdrom.Add(&log);
+ bool res = true;
+
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+ unsigned int count = 0;
+
+ if (AutoDetect && UdevCdroms.Dlopen())
+ {
+ while (AutoDetectCdrom(UdevCdroms, count))
+ res &= cdrom.Add(&log);
+ } else {
+ res = cdrom.Add(&log);
+ }
+
if(res)
cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
+
return res;
}
/*}}}*/
@@ -120,10 +169,24 @@ bool DoAdd(CommandLine &)
/* */
bool DoIdent(CommandLine &)
{
+ pkgUdevCdromDevices UdevCdroms;
string ident;
pkgCdromTextStatus log;
pkgCdrom cdrom;
- return cdrom.Ident(ident, &log);
+ bool res = true;
+
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+ unsigned int count = 0;
+
+ if (AutoDetect && UdevCdroms.Dlopen())
+ {
+ while (AutoDetectCdrom(UdevCdroms, count))
+ res &= cdrom.Ident(ident, &log);
+ } else {
+ return cdrom.Ident(ident, &log);
+ }
+
+ return res;
}
/*}}}*/
// ShowHelp - Show the help screen /*{{{*/
@@ -164,6 +227,7 @@ int main(int argc,const char *argv[]) /*{{{*/
{
CommandLine::Args Args[] = {
{'h',"help","help",0},
+ {'a',"auto-detect","Acquire::cdrom::AutoDetect",0},
{'v',"version","version",0},
{'d',"cdrom","Acquire::cdrom::mount",CommandLine::HasArg},
{'r',"rename","APT::CDROM::Rename",0},
diff --git a/debian/apt.dirs b/debian/apt.dirs
index fb6716c35..b812f116b 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -9,6 +9,7 @@ etc/logrotate.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
var/lib/apt/periodic
+var/lib/apt/media
var/log/apt
usr/share/bug/apt
usr/share/lintian/overrides
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 0e78851ff..4bbc01c2c 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -116,23 +116,24 @@ bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
return false;
// check if we have the mount point
- if (!FileExists("/media/apt"))
- mkdir("/media/apt", 0755);
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ if (!FileExists(AptMountPoint))
+ mkdir(AptMountPoint.c_str(), 0750);
// now try mounting
for (unsigned int i=0; i < v.size(); i++)
{
if (!v[i].Mounted)
{
- if(MountCdrom("/media/apt", v[i].DeviceName))
+ if(MountCdrom(AptMountPoint, v[i].DeviceName))
{
- if (IsCorrectCD(Get, "/media/apt", NewID))
+ if (IsCorrectCD(Get, AptMountPoint, NewID))
{
MountedByApt = true;
- CDROM = "/media/apt";
+ CDROM = AptMountPoint;
return true;
} else {
- UnmountCdrom("/media/apt");
+ UnmountCdrom(AptMountPoint);
}
}
}