civodul pushed a commit to branch master
in repository guix.
commit 29164192e94e35616a5078c28bf0eb5d5a3ea4b4
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Mar 17 11:27:52 2025 +0100
linux-container: ‘unprivileged-user-namespace-supported?’ returns #f on
non-Linux.
Previously this procedure would return #t on non-Linux systems.
* gnu/build/linux-container.scm (unprivileged-user-namespace-supported?):
When USERNS-FILE doesn’t exist, return (user-namespace-supported?).
Reported-by: Reepca Russelstein <[email protected]>
Change-Id: I92050338b8b68bc3bd87100317eba69fcdf14a0a
---
gnu/build/linux-container.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/build/linux-container.scm b/gnu/build/linux-container.scm
index 5c303da8c8..a5c5d8962e 100644
--- a/gnu/build/linux-container.scm
+++ b/gnu/build/linux-container.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <[email protected]>
-;;; Copyright © 2017-2019, 2022, 2023 Ludovic Courtès <[email protected]>
+;;; Copyright © 2017-2019, 2022-2023, 2025 Ludovic Courtès <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -44,7 +44,7 @@
(let ((userns-file "/proc/sys/kernel/unprivileged_userns_clone"))
(if (file-exists? userns-file)
(eqv? #\1 (call-with-input-file userns-file read-char))
- #t)))
+ (user-namespace-supported?))))
(define (setgroups-supported?)
"Return #t if the setgroups proc file, introduced in Linux-libre 3.19,
