diff options
| author | Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> | 2019-08-07 08:43:27 -0400 |
|---|---|---|
| committer | Christopher Lemmer Webber <cwebber@dustycloud.org> | 2019-08-07 16:05:58 -0400 |
| commit | 55e238f2ab24ce347047ebc7fd7c5eba62dac69d (patch) | |
| tree | c4e5fa04db91e37c7430e4ce23366cb187249693 | |
| parent | ec12235ce207821027971c9d5f47b660b29f5ed5 (diff) | |
| download | guix-55e238f2ab24ce347047ebc7fd7c5eba62dac69d.tar guix-55e238f2ab24ce347047ebc7fd7c5eba62dac69d.tar.gz | |
deploy: Use all machine modules when loading deployment
* guix/scripts/deploy.scm (load-source-file): Enumerate and include all
submodules of (gnu machine) when loading the provided deployment
specification.
| -rw-r--r-- | guix/scripts/deploy.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 52bba3f3bf..ebc99e52cc 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -19,6 +19,7 @@ (define-module (guix scripts deploy) #:use-module (gnu machine) + #:use-module (guix discovery) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (guix store) @@ -74,7 +75,10 @@ Perform the deployment specified by FILE.\n")) (define (load-source-file file) "Load FILE as a user module." - (let ((module (make-user-module '((gnu) (gnu machine) (gnu machine ssh))))) + (let* ((guix-path (dirname (search-path %load-path "guix.scm"))) + (environment-modules (scheme-modules* guix-path "gnu/machine")) + (module (make-user-module (append '((gnu) (gnu machine)) + environment-modules)))) (load* file module))) (define (guix-deploy . args) |