diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
commit | 4e5e05d40908e9f1336ffc5a6c4928ab61ad034c (patch) | |
tree | ad6d6be0ece396ba3353871a5691e514253508f8 /guix/scripts/archive.scm | |
parent | 2c400ae94207b3b84fcdcaa21c122076c050d307 (diff) | |
parent | e1fa3ea9fe8d01dd124c5e304bde9243876378ba (diff) | |
download | guix-patches-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar guix-patches-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/archive.scm')
-rw-r--r-- | guix/scripts/archive.scm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index 02557ce454..c04baf9784 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -310,6 +311,16 @@ the input port." (leave (G_ "failed to read public key: ~a: ~a~%") (error-source err) (error-string err))))) + ;; Warn about potentially volatile ACLs, but continue: system reconfiguration + ;; might not be possible without (newly-authorized) substitutes. + (let ((stat (false-if-exception (lstat %acl-file)))) + (when (and stat (eq? 'symlink (stat:type (lstat %acl-file)))) + (warning (G_ "replacing symbolic link ~a with a regular file~%") + %acl-file) + (when (string-prefix? (%store-prefix) (readlink %acl-file)) + (display-hint (G_ "On Guix System, add public keys to the +@code{authorized-keys} field of your @code{operating-system} instead."))))) + (let ((key (read-key)) (acl (current-acl))) (unless (eq? 'public-key (canonical-sexp-nth-data key 0)) |