From 25a04630d6eef123a62f50703b82cc62acf1fbfb Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 7 Mar 2007 12:06:08 +0100
Subject:   - added APT::CDROM::UnMountOnFinish to have more control over    
 the umount/mount process

---
 apt-pkg/cdrom.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'apt-pkg/cdrom.cc')

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 4d45d38a2..241688785 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -508,8 +508,10 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log)
 		      CDROM.c_str());
       log->Update(msg.str());
    }
-   if (MountCdrom(CDROM) == false)
-      return _error->Error("Failed to mount the cdrom.");
+
+   if (_config->FindB("APT::CDROM::NoMount",false) == false)
+      if (MountCdrom(CDROM) == false)
+	 return _error->Error("Failed to mount the cdrom.");
 
    // Hash the CD to get an ID
    if(log) 
@@ -803,7 +805,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    
 
    // Unmount and finish
-   if (_config->FindB("APT::CDROM::NoMount",false) == false) {
+   if (_config->FindB("APT::CDROM::NoMount",false) == false &&
+       _config->FindB("APT::CDROM::UnMountOnFinish",true) == true) {
       log->Update(_("Unmounting CD-ROM..."), STEP_LAST);
       UnmountCdrom(CDROM);
    }
-- 
cgit v1.2.3