Просмотр исходного кода

* apt-pkg/deb/dpkgpm.cc:
- provide DPkg::Chroot-Directory config option (useful for testing)

Michael Vogt лет назад: 17
Родитель
Сommit
4b7cfe96d6
2 измененных файлов с 11 добавлено и 0 удалено
  1. 9 0
      apt-pkg/deb/dpkgpm.cc
  2. 2 0
      debian/changelog

+ 9 - 0
apt-pkg/deb/dpkgpm.cc

@@ -866,6 +866,15 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	 }
 	 close(fd[0]); // close the read end of the pipe
 
+	 if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
+	 {
+	    std::cerr << "Chrooting into " 
+		      << _config->FindDir("DPkg::Chroot-Directory") 
+		      << std::endl;
+	    if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
+	       _exit(100);
+	 }
+
 	 if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
 	    _exit(100);
 	 

+ 2 - 0
debian/changelog

@@ -27,6 +27,8 @@ apt (0.7.21) UNRELEASED; urgency=low
   * methods/http.cc:
     - ignore SIGPIPE, we deal with EPIPE from write in 
       HttpMethod::ServerDie() (LP: #385144)
+  * apt-pkg/deb/dpkgpm.cc:
+    - provide DPkg::Chroot-Directory config option (useful for testing)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 May 2009 17:51:42 +0200