From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 19 Apr 2020 17:51:46 +0000 (+0100)
Subject: Merge branch 'master' into deploy.spirit
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/fecf9644a3c004b3ea3aa9be085882341f0a11d2

Merge branch 'master' into deploy.spirit

* master:
  src/jobclient.c: Cope if the jobserver pipe is set nonblocking.
  bin/chroot-maint: Force `--no-merged-usr'.
  bin/chroot-maint: Update the path correctly when following a symlink.
  bin/chroot-maint: Don't forget to copy symlinks to directories.
---

fecf9644a3c004b3ea3aa9be085882341f0a11d2