01/01: deploy: Use all machine modules when loading deployment

[guix-commits]

cwebber pushed a commit to branch master
in repository guix.

commit 55e238f2ab24ce347047ebc7fd7c5eba62dac69d
Author: Jakob L. Kreuze <address@hidden>
Date:   Wed Aug 7 08:43:27 2019 -0400

    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.
---
 guix/scripts/deploy.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index 52bba3f..ebc99e5 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)