diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-21 23:24:49 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-22 11:51:12 +0200 |
| commit | 60a56db0074259355a590851131aa23e1549fd8c (patch) | |
| tree | 2192007389d19a5afcba1d7a4e18537b93681326 | |
| parent | ea982704430b061f263580041d4f94174d8ba5cd (diff) | |
| download | gnu-guix-60a56db0074259355a590851131aa23e1549fd8c.tar gnu-guix-60a56db0074259355a590851131aa23e1549fd8c.tar.gz | |
services: swap: Use 'restart-on-EINTR'.
* gnu/services/base.scm (swap-service)[start, stop]: Use 'restart-on-EINTR'.
* guix/build/syscalls.scm (swapoff): Fix typo in 'throw' arguments.
| -rw-r--r-- | gnu/services/base.scm | 4 | ||||
| -rw-r--r-- | guix/build/syscalls.scm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 697b9395c2..d5744204d9 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -851,10 +851,10 @@ gexp, to open it, and evaluate @var{close} to close it." (requirement `(udev ,@requirement)) (documentation "Enable the given swap device.") (start #~(lambda () - (swapon #$device) + (restart-on-EINTR (swapon #$device)) #t)) (stop #~(lambda _ - (swapoff #$device) + (restart-on-EINTR (swapoff #$device)) #f)) (respawn? #f))))) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 9ec7e8b4a9..3585bf27a8 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -218,7 +218,7 @@ constants from <sys/mount.h>." (let ((ret (proc (string->pointer device))) (err (errno))) (unless (zero? ret) - (throw 'system-error "swapff" "~S: ~A" + (throw 'system-error "swapoff" "~S: ~A" (list device (strerror err)) (list err))))))) |