diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
| commit | 1a8f7a0f584e5dd6e8f1a379b92f689b71902295 (patch) | |
| tree | 8586450fc3068b217e60a7e942fa4c7d89ad74e7 /gnu/services.scm | |
| parent | 19d42e0e23a7f90ac2dcc1c279bd23a967ff0314 (diff) | |
| parent | 2a4f3c1711fdb947e615b5a89e285421b3bf0925 (diff) | |
| download | guix-patches-1a8f7a0f584e5dd6e8f1a379b92f689b71902295.tar guix-patches-1a8f7a0f584e5dd6e8f1a379b92f689b71902295.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services.scm')
| -rw-r--r-- | gnu/services.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index 11ba21e824..4b30399adc 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -461,7 +461,12 @@ channels in use and CONFIG-FILE, if it is true." (mbegin %store-monad (let ((config-file (cond ((string? config-file) - (local-file config-file "configuration.scm")) + ;; CONFIG-FILE has been passed typically via + ;; 'guix system reconfigure CONFIG-FILE' so we + ;; can assume it's valid: tell 'local-file' to + ;; not emit a warning. + (local-file (assume-valid-file-name config-file) + "configuration.scm")) ((not config-file) #f) (else |