From 977eb5d023cfdf8e336f1896480eea9cef5c04e9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Nov 2020 11:03:19 +0100 Subject: Properly deal with build directories containing '~'. Fixes . Reported by Vagrant Cascadian . * tests/build-utils.scm ("wrap-script, simple case"): Pass SCRIPT-CONTENTS to 'display' rather than 'format'. * gnu/services/base.scm (file-system->shepherd-service-name) [valid-characters, mount-point]: New variables. Filter out invalid store file name characters from the mount point of FILE-SYSTEM. --- gnu/services/base.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 499e50bfd7..712b3a018f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -285,8 +285,19 @@ This service must be the root of the service dependency graph so that its (define (file-system->shepherd-service-name file-system) "Return the symbol that denotes the service mounting and unmounting FILE-SYSTEM." - (symbol-append 'file-system- - (string->symbol (file-system-mount-point file-system)))) + (define valid-characters + ;; Valid store characters; see 'checkStoreName' in the daemon. + (string->char-set + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+-._?=")) + + (define mount-point + (string-map (lambda (chr) + (if (char-set-contains? valid-characters chr) + chr + #\-)) + (file-system-mount-point file-system))) + + (symbol-append 'file-system- (string->symbol mount-point))) (define (mapped-device->shepherd-service-name md) "Return the symbol that denotes the shepherd service of MD, a ." -- cgit v1.2.3 From 6cad3f6966e056c4d8a32cb85446040f56929c50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Nov 2020 18:26:55 +0100 Subject: services: mingetty: Export configuration accessors. * gnu/services/base: Export configuration accessors for mingetty. --- gnu/services/base.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/services') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 712b3a018f..55d8c91cb5 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -106,6 +106,12 @@ agetty-service-type mingetty-configuration + mingetty-configuration-tty + mingetty-configuration-auto-login + mingetty-configuration-login-program + mingetty-configuration-login-pause? + mingetty-configuration-clear-on-logout? + mingetty-configuration-mingetty mingetty-configuration? mingetty-service mingetty-service-type -- cgit v1.2.3 ocatable.sh?id=a67b82475dc14d0be7e14a5438ce70fa94de1907'>tests: pack-relocatable: Ensure commands can run in the current namespace....Paul Garlick 2020-10-31pack: Relocatable wrapper leaves root available to child processes....Ludovic Courtès 2020-10-30guix: pack: Only wrap executable files....Eric Bavier 2020-09-28tests: Simplify shell exit status negation;...Eric Bavier 2020-07-28pack: "fakechroot" engine always creates its store....Ludovic Courtès 2020-07-28pack: "fakechroot" execution engine can load its audit module....Ludovic Courtès 2020-07-24pack: '-R' applies to propagated inputs too....Ludovic Courtès 2020-05-14pack: Add relocation via ld.so and fakechroot....Ludovic Courtès 2020-05-14pack: Wrapper honors 'GUIX_EXECUTION_ENGINE' environment variable....Ludovic Courtès 2020-04-24pack: 'guix pack -R' wrapper correctly reports exit code....Ludovic Courtès