diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/gc.cc | 5 | ||||
| -rw-r--r-- | nix/local.mk | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index 8bc4e01eb0..e1d0765154 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -455,7 +455,10 @@ void LocalStore::deletePathRecursive(GCState & state, const Path & path) throw SysError(format("unable to rename `%1%' to `%2%'") % path % tmp); state.bytesInvalidated += size; } catch (SysError & e) { - if (e.errNo == ENOSPC) { + /* In a Docker container, rename(2) returns EXDEV when the source + and destination are not both on the "top layer". See: + https://bugs.gnu.org/41607 */ + if (e.errNo == ENOSPC || e.errNo == EXDEV) { printMsg(lvlInfo, format("note: can't create move `%1%': %2%") % path % e.msg()); deleteGarbage(state, path); } diff --git a/nix/local.mk b/nix/local.mk index dbcdde8b0d..c136fb7202 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -175,6 +175,7 @@ etc/guix-%.service: etc/guix-%.service.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +# The service script for sysvinit. sysvinitservicedir = $(sysconfdir)/init.d nodist_sysvinitservice_DATA = etc/init.d/guix-daemon |