diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-23 14:23:34 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-23 14:35:13 -0700 |
| commit | 66a9404ddc9541dde17cdf9e99b15f2b197409f5 (patch) | |
| tree | 2775df32d523950ca152acaa8db2f6a3e75a79dd /src/property | |
| parent | 98b29ed4ce015721a85f45b87e051809eaf546f8 (diff) | |
| download | consfigurator-66a9404ddc9541dde17cdf9e99b15f2b197409f5.tar.gz | |
rename REBOOT:REBOOTED-AT-END -> REBOOT:AT-END
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property')
| -rw-r--r-- | src/property/installer.lisp | 6 | ||||
| -rw-r--r-- | src/property/reboot.lisp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/property/installer.lisp b/src/property/installer.lisp index ff74a4d..816ca05 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -162,8 +162,8 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE." ;;; that the AT-END functions get run even when there's a nonlocal exit from ;;; %CONSFIGURE's call to APPLY-PROPAPP; perhaps we could pass a second ;;; argument to the AT-END functions indicating whether there was a non-local -;;; transfer of control. REBOOT:REBOOTED-AT-END might only reboot when there -;;; was a normal return from APPLY-PROPAPP, whereas the cleanup forms from +;;; transfer of control. REBOOT:AT-END might only reboot when there was a +;;; normal return from APPLY-PROPAPP, whereas the cleanup forms from ;;; SERVICES:WITHOUT-STARTING-SERVICES would always be evaluated. (defprop %root-filesystems-flipped :lisp (new-os old-os) @@ -400,4 +400,4 @@ live system and use Consfigurator to install to the host's usual storage." (%root-filesystems-flipped "/new-os" "/old-os") ;; Prevent boot issues caused by disabled shadow passwords. (cmd:single "shadowconfig" "on") - (reboot:rebooted-at-end))) + (reboot:at-end))) diff --git a/src/property/reboot.lisp b/src/property/reboot.lisp index 5728e0a..fe213d8 100644 --- a/src/property/reboot.lisp +++ b/src/property/reboot.lisp @@ -18,16 +18,16 @@ (in-package :consfigurator.property.reboot) (named-readtables:in-readtable :consfigurator) -(defprop %rebooted-at-end :posix () - (:apply (at-end +(defprop %at-end :posix () + (:apply (consfigurator:at-end (lambda (result) (declare (ignore result)) (mrun "shutdown" "-r" "+1") (inform t "*** SYSTEM REBOOT SCHEDULED, one minute delay ***"))))) -(defproplist rebooted-at-end :posix () +(defproplist at-end :posix () "Schedule a reboot for the end of the current (sub)deployment. The reboot is scheduled with a one minute delay to allow remote Lisp images to return correct exit statuses to the root Lisp, for the root Lisp to have time to download their output, etc." - (container:when-contained (:reboot) (%rebooted-at-end))) + (container:when-contained (:reboot) (%at-end))) |