~ruther/guix-local

72ce03739e24d9e2908342fc0e6384e6dfb802f5 — Ludovic Courtès 13 years ago 07ab4bf
daemon: Add `--chroot-directory'.

* nix/nix-daemon/guix-daemon.cc (GUIX_OPT_CHROOT_DIR): New macro.
  (options): Add `--chroot-directory'.
  (parse_opt): Handle it.
1 files changed, 11 insertions(+), 0 deletions(-)

M nix/nix-daemon/guix-daemon.cc
M nix/nix-daemon/guix-daemon.cc => nix/nix-daemon/guix-daemon.cc +11 -0
@@ 58,6 58,7 @@ builds derivations on behalf of its clients.";
#define GUIX_OPT_DISABLE_STORE_OPTIMIZATION 7
#define GUIX_OPT_IMPERSONATE_LINUX_26 8
#define GUIX_OPT_DEBUG 9
#define GUIX_OPT_CHROOT_DIR 10

static const struct argp_option options[] =
  {


@@ 74,6 75,13 @@ static const struct argp_option options[] =
      "this option has no effect)"
#endif
    },
    { "chroot-directory", GUIX_OPT_CHROOT_DIR, "DIR", 0,
      "Add DIR to the build chroot"
#ifndef HAVE_CHROOT
      " (chroots are not supported in this configuration, so "
      "this option has no effect)"
#endif
    },
    { "build-users-group", GUIX_OPT_BUILD_USERS_GROUP, "GROUP", 0,
      "Perform builds as a user of GROUP" },
    { "cache-failures", GUIX_OPT_CACHE_FAILURES, 0, 0,


@@ 104,6 112,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
    case GUIX_OPT_DISABLE_CHROOT:
      settings.useChroot = false;
      break;
    case GUIX_OPT_CHROOT_DIR:
      settings.dirsInChroot.insert (arg);
      break;
    case GUIX_OPT_DISABLE_LOG_COMPRESSION:
      settings.compressLog = false;
      break;