From d088d5c4848f08bd62e722789132f9345659c52c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Jun 2019 11:14:41 +0200 Subject: accounts: Call 'fdatasync' when writing databases. * gnu/build/accounts.scm (catch-ENOSYS): New macro. (database-writer): Call 'fdatasync'. --- gnu/build/accounts.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/build/accounts.scm') diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm index 2120c1d11d..b90149565f 100644 --- a/gnu/build/accounts.scm +++ b/gnu/build/accounts.scm @@ -19,6 +19,7 @@ (define-module (gnu build accounts) #:use-module (guix records) #:use-module (guix combinators) + #:use-module ((guix build syscalls) #:select (fdatasync)) #:use-module (gnu system accounts) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) @@ -230,6 +231,14 @@ (define %password-lock-file ;; grab this lock with 'with-file-lock' when they access the databases. "/etc/.pwd.lock") +(define-syntax-rule (catch-ENOSYS exp) + (catch 'system-error + (lambda () exp) + (lambda args + (if (= ENOSYS (system-error-errno args)) + #f + (apply throw args))))) + (define (database-writer file mode entry->string) (lambda* (entries #:optional (file-or-port file)) "Write ENTRIES to FILE-OR-PORT. When FILE-OR-PORT is a file name, write @@ -249,6 +258,11 @@ (define (write-entries port) (lambda () (chmod port mode) (write-entries port) + + ;; XXX: When booting with the statically-linked Guile, + ;; 'fdatasync' is unavailable. + (catch-ENOSYS (fdatasync port)) + (close-port port) (rename-file template file-or-port)) (lambda () -- cgit v1.2.3