futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-container: 'containerized-operating-system' removes "useless" services.

Browse Source 
Fixes <https://bugs.gnu.org/34211>.
Reported by Efraim Flashner <efraim@flashner.co.il>.

* gnu/system/linux-container.scm (containerized-operating-system)
[useless-services]: New variable.
Add 'services' field.
This commit is contained in:
Ludovic Courtès 2019-03-13 23:10:19 +01:00
parent e1c15e8b8e
commit b94c80ff5d
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/system/linux-container.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,6 +28,7 @@
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (gnu build linux-container) #:use-module (gnu build linux-container)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services base)
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:export (system-container #:export (system-container
@ -54,8 +55,19 @@ containerized OS."
(file-system (inherit (file-system-mapping->bind-mount fs)) (file-system (inherit (file-system-mapping->bind-mount fs))
(needed-for-boot? #t))) (needed-for-boot? #t)))
(define useless-services
;; Services that make no sense in a container. Those that attempt to
;; access /dev/tty[0-9] in particular cannot work in a container.
(list console-font-service-type
mingetty-service-type
agetty-service-type))
(operating-system (inherit os) (operating-system (inherit os)
(swap-devices '()) ; disable swap (swap-devices '()) ; disable swap
(services (remove (lambda (service)
(memq (service-kind service)
useless-services))
(operating-system-user-services os)))
(file-systems (append (map mapping->fs (cons %store-mapping mappings)) (file-systems (append (map mapping->fs (cons %store-mapping mappings))
%container-file-systems %container-file-systems
user-file-systems)))) user-file-systems))))