diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-01 13:02:17 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-01 15:47:54 -0700 |
commit | 7cc4d107302ba19fbc62bb0b01be3067f783b9d7 (patch) | |
tree | 40eb81cf60cc6821031346c0dd4956fb6f293292 | |
parent | 6ddbb0f222980f0f8f54284ea8bb5e4d94f68b80 (diff) | |
download | consfigurator-7cc4d107302ba19fbc62bb0b01be3067f783b9d7.tar.gz |
replace some (REQUIRE "sb-posix") calls with conditional dependency
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r-- | consfigurator.asd | 1 | ||||
-rw-r--r-- | src/connection/chroot/fork.lisp | 2 | ||||
-rw-r--r-- | src/connection/fork.lisp | 2 | ||||
-rw-r--r-- | src/connection/setuid.lisp | 2 | ||||
-rw-r--r-- | src/data.lisp | 9 |
5 files changed, 5 insertions, 11 deletions
diff --git a/consfigurator.asd b/consfigurator.asd index 0ddb32c..764799e 100644 --- a/consfigurator.asd +++ b/consfigurator.asd @@ -12,6 +12,7 @@ #:cl-interpol #:named-readtables #:cffi + #+sbcl #:sb-posix #:trivial-backtrace #:trivial-macroexpand-all) :components ((:file "src/package") diff --git a/src/connection/chroot/fork.lisp b/src/connection/chroot/fork.lisp index 69a9d12..07e43f5 100644 --- a/src/connection/chroot/fork.lisp +++ b/src/connection/chroot/fork.lisp @@ -17,8 +17,6 @@ (in-package :consfigurator.connection.chroot.fork) (named-readtables:in-readtable :consfigurator) -#+sbcl (eval-when (:compile-toplevel :load-toplevel :execute) - (require "sb-posix")) (defun chroot (path) #+sbcl (sb-posix:chroot path) diff --git a/src/connection/fork.lisp b/src/connection/fork.lisp index 67ce84e..be392cd 100644 --- a/src/connection/fork.lisp +++ b/src/connection/fork.lisp @@ -17,8 +17,6 @@ (in-package :consfigurator.connection.fork) (named-readtables:in-readtable :consfigurator) -#+sbcl (eval-when (:compile-toplevel :load-toplevel :execute) - (require "sb-posix")) ;; Use only implementation-specific fork and waitpid calls to avoid thread ;; woes. Things like chroot(2) and setuid(2), however, should be okay. diff --git a/src/connection/setuid.lisp b/src/connection/setuid.lisp index 1397599..51685f2 100644 --- a/src/connection/setuid.lisp +++ b/src/connection/setuid.lisp @@ -17,8 +17,6 @@ (in-package :consfigurator.connection.setuid) (named-readtables:in-readtable :consfigurator) -#+sbcl (eval-when (:compile-toplevel :load-toplevel :execute) - (require "sb-posix")) (defun setuid (uid) #+sbcl (sb-posix:setuid uid) diff --git a/src/data.lisp b/src/data.lisp index b6feb34..21fdb65 100644 --- a/src/data.lisp +++ b/src/data.lisp @@ -473,10 +473,9 @@ chance of those passwords showing up in the clear in the Lisp debugger." ;;;; Programs for remote Lisp images -;; TODO unclear whether the need for this is a bug in trivial-macroexpand-all -(define-constant +continue-deploy*-program-implementation-specific+ - "#+sbcl (require \"sb-cltl2\")" - :test #'equal) +;; TODO unclear whether the need for sb-cltl2 require is a bug in trivial-macroexpand-all +(defparameter continue-deploy*-program-implementation-specific + "#+sbcl (require \"sb-posix\") #+sbcl (require \"sb-cltl2\")") (defun continue-deploy*-program (remaining-connections) "Return a program to complete the work of an enclosing call to DEPLOY*. @@ -561,7 +560,7 @@ Preprocessing must occur in the root Lisp.")) ;; those packages (values (format nil "~A~%~{~A~^~%~}" - +continue-deploy*-program-implementation-specific+ + continue-deploy*-program-implementation-specific (mapcar #'prin1-to-string forms)) forms))) (print-not-readable (c) |