mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
services: cleanup-service: Catch 'system-error' instead of everything.
This makes sure that critical errors such as unbound-variable do not go undetected. * gnu/services.scm (cleanup-gexp): Introduce local 'fail-safe' macro and use it. Remove uses of 'false-if-exception'.
This commit is contained in:
parent
341ae58213
commit
3c4c8c3e06
1 changed files with 17 additions and 6 deletions
|
@ -255,12 +255,23 @@ (define %modules
|
|||
;; XXX This needs to happen before service activations, so it
|
||||
;; has to be here, but this also implicitly assumes that /tmp
|
||||
;; and /var/run are on the root partition.
|
||||
(false-if-exception (delete-file-recursively "/tmp"))
|
||||
(false-if-exception (delete-file-recursively "/var/run"))
|
||||
(false-if-exception (mkdir "/tmp"))
|
||||
(false-if-exception (chmod "/tmp" #o1777))
|
||||
(false-if-exception (mkdir "/var/run"))
|
||||
(false-if-exception (chmod "/var/run" #o755))))))
|
||||
(letrec-syntax ((fail-safe (syntax-rules ()
|
||||
((_ exp rest ...)
|
||||
(begin
|
||||
(catch 'system-error
|
||||
(lambda () exp)
|
||||
(const #f))
|
||||
(fail-safe rest ...)))
|
||||
((_)
|
||||
#t))))
|
||||
;; Ignore I/O errors so the system can boot.
|
||||
(fail-safe
|
||||
(delete-file-recursively "/tmp")
|
||||
(delete-file-recursively "/var/run")
|
||||
(mkdir "/tmp")
|
||||
(chmod "/tmp" #o1777)
|
||||
(mkdir "/var/run")
|
||||
(chmod "/var/run" #o755)))))))
|
||||
|
||||
(define cleanup-service-type
|
||||
;; Service that cleans things up in /tmp and similar.
|
||||
|
|
Loading…
Reference in a new issue