diff options
| author | Roger Leigh <rleigh@debian.org> | 2008-04-27 22:23:53 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2008-04-27 22:23:53 +0100 |
| commit | 49e2502b9bc4515edfb0fa26b38e35176a60a0c8 (patch) | |
| tree | b644936b6656d0c9725f20f823b1de845e554c98 /bin | |
| parent | c3929350bf00320470c3d63b08a9450960fce90b (diff) | |
| download | schroot-49e2502b9bc4515edfb0fa26b38e35176a60a0c8.tar.gz | |
[schroot] Read additional configuration from /etc/schroot/chroot.d.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/schroot/Makefile.am | 3 | ||||
| -rw-r--r-- | bin/schroot/schroot-main-base.cc | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bin/schroot/Makefile.am b/bin/schroot/Makefile.am index 4567b930..b61c3557 100644 --- a/bin/schroot/Makefile.am +++ b/bin/schroot/Makefile.am @@ -1,7 +1,7 @@ # schroot Makefile template # # -# Copyright © 2004-2007 Roger Leigh <rleigh@debian.org> +# Copyright © 2004-2008 Roger Leigh <rleigh@debian.org> # # schroot is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -70,5 +70,6 @@ install-exec-hook: chmod 4755 "$(DESTDIR)$(bindir)/schroot" install-data-hook: + $(MKINSTALLDIRS) $(DESTDIR)$(SCHROOT_CONF_CHROOT_D) $(MKINSTALLDIRS) $(DESTDIR)$(SCHROOT_MOUNT_DIR) $(MKINSTALLDIRS) $(DESTDIR)$(SCHROOT_SESSION_DIR) diff --git a/bin/schroot/schroot-main-base.cc b/bin/schroot/schroot-main-base.cc index c33a9a62..1ce4e0ac 100644 --- a/bin/schroot/schroot-main-base.cc +++ b/bin/schroot/schroot-main-base.cc @@ -161,7 +161,10 @@ main_base::load_config () /* The normal chroot list is used when starting a session or running any chroot type or session, or displaying chroot information. */ if (this->options->load_chroots == true) - this->config->add(SCHROOT_CONF, false); + { + this->config->add(SCHROOT_CONF, false); + this->config->add(SCHROOT_CONF_CHROOT_D, false); + } /* The session chroot list is used when running or ending an existing session, or displaying chroot information. */ if (this->options->load_sessions == true) |