[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: system: Do not add "--disable-chroot" to containers.
From: |
guix-commits |
Subject: |
01/01: system: Do not add "--disable-chroot" to containers. |
Date: |
Tue, 21 May 2024 14:25:57 -0400 (EDT) |
andreas pushed a commit to branch wip-plmshift
in repository guix.
commit f1e7dbf115e9d3a18d6f2b724e0fba4fff910533
Author: Andreas Enge <andreas@enge.fr>
AuthorDate: Wed Feb 14 09:55:00 2024 +0100
system: Do not add "--disable-chroot" to containers.
* gnu/system/linux-container.scm (containerized-operating-system): Do not
add "--disable-chroot".
Change-Id: I1eff9aa0d02d6e53bd4e42f3aeb07d0ab42616a8
---
gnu/system/linux-container.scm | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index c780b68fba..2fc54a8121 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -159,17 +159,6 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file
systems to add to OS."
(nscd-configuration
(inherit (service-value s))
(caches
%nscd-container-caches))))
- ((eq? guix-service-type (service-kind s))
- ;; Pass '--disable-chroot' so that
- ;; guix-daemon can build thing even in
- ;; Docker without '--privileged'.
- (service guix-service-type
- (guix-configuration
- (inherit (service-value s))
- (extra-options
- (cons "--disable-chroot"
-
(guix-configuration-extra-options
- (service-value s)))))))
(else s)))
(operating-system-user-services os))))
(file-systems (append (map mapping->fs