From 1708ed6e9d778795558ea4a2fd949270abd79797 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Feb 2020 18:21:55 +0100 Subject: marionette: 'wait-for' procedures no longer leak a port. * gnu/build/marionette.scm (wait-for-tcp-port): Close SOCK upon success. (wait-for-unix-socket): Likewise. --- gnu/build/marionette.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/build') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 1dbe385e89..a9dbce538f 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. @@ -204,6 +204,7 @@ MARIONETTE. Raise an error on failure." (catch 'system-error (lambda () (connect sock AF_INET INADDR_LOOPBACK ,port) + (close-port sock) 'success) (lambda args (if (< i ,timeout) @@ -227,6 +228,7 @@ accept connections in MARIONETTE. Raise an error on failure." (catch 'system-error (lambda () (connect sock AF_UNIX ,file-name) + (close-port sock) 'success) (lambda args (if (< i ,timeout) -- cgit v1.2.3 From b6ec284fe8b67bba4b17aab98641a91a17658133 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Feb 2020 15:04:17 +0100 Subject: marionette: Provide portable US-layout keystrokes for "<" and ">". * gnu/build/marionette.scm (%qwerty-us-keystrokes): Use shit-comma and shift-dot for #\< and #\> because the "less" key doesn't work the same in "US intl." layouts. --- gnu/build/marionette.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/build') diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index a9dbce538f..fe754cd147 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -317,8 +317,8 @@ PREDICATE, whichever comes first. Raise an error when TIMEOUT is exceeded." (#\( . "shift-9") (#\) . "shift-0") (#\/ . "slash") - (#\< . "less") - (#\> . "shift-less") + (#\< . "shift-comma") + (#\> . "shift-dot") (#\. . "dot") (#\, . "comma") (#\; . "semicolon") -- cgit v1.2.3 From cc9b889e8f285719645b5a86f2583d7f1b2aef01 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 Feb 2020 12:57:29 -0500 Subject: linux-boot: Ensure volatile root is mounted read-only. * gnu/build/linux-boot.scm (mount-root-file-system): Ensure MS_RDONLY is present among the root file system flags when VOLATILE-ROOT? is #t. --- gnu/build/linux-boot.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/build') diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 3d40a7d05d..4fb711b8f2 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -362,12 +362,12 @@ the last argument of `mknod'." "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is true, mount ROOT read-only and make it an overlay with a writable tmpfs using the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use -to mount ROOT." +to mount ROOT, and behave the same as for the `mount' procedure." (if volatile-root? (begin (mkdir-p "/real-root") - (mount root "/real-root" type MS_RDONLY options) + (mount root "/real-root" type (logior MS_RDONLY flags) options) (mkdir-p "/rw-root") (mount "none" "/rw-root" "tmpfs") -- cgit v1.2.3 From 85a7466e22d345444f952b57346f4c09de020c1f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 24 Feb 2020 11:08:42 -0500 Subject: build: file-systems: Do not warn about file system check for NFS. * gnu/build/file-systems.scm (check-file-system): Define a dummy checker procedure for NFS that always passes to prevent a warning from being emitted. --- gnu/build/file-systems.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/build') diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index ee6375515f..902563b219 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 David C. Trudgian +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -581,6 +582,7 @@ were found." ((string-prefix? "btrfs" type) check-btrfs-file-system) ((string-suffix? "fat" type) check-fat-file-system) ((string-prefix? "jfs" type) check-jfs-file-system) + ((string-prefix? "nfs" type) (const 'pass)) (else #f))) (if check-procedure -- cgit v1.2.3