diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
| commit | 982eff9e841f3539e4ecf93669435a290bfde571 (patch) | |
| tree | b1e3f6fc85c6c35c264f091eb2fc5cff8514c230 /gnu/build/activation.scm | |
| parent | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (diff) | |
| parent | 7158fe4ded47a599ceb8d556132ba83fcc686962 (diff) | |
| download | patches-982eff9e841f3539e4ecf93669435a290bfde571.tar patches-982eff9e841f3539e4ecf93669435a290bfde571.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build/activation.scm')
| -rw-r--r-- | gnu/build/activation.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index c6c7e7fd3b..6d69628eb2 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. @@ -247,7 +247,19 @@ they already exist." string<?)) (mkdir-p %setuid-directory)) - (for-each make-setuid-program programs)) + (for-each (lambda (program) + (catch 'system-error + (lambda () + (make-setuid-program program)) + (lambda args + ;; If we fail to create a setuid program, better keep going + ;; so that we don't leave %SETUID-DIRECTORY empty or + ;; half-populated. This can happen if PROGRAMS contains + ;; incorrect file names: <https://bugs.gnu.org/38800>. + (format (current-error-port) + "warning: failed to make '~a' setuid-root: ~a~%" + program (strerror (system-error-errno args)))))) + programs)) (define (activate-special-files special-files) "Install the files listed in SPECIAL-FILES. Each element of SPECIAL-FILES |