Merge pull request #2133 from poettering/import-drop-dkr

System Internals / systemd - Daniel Mack [zonque.org] - 10 December 2015 10:40 UTC

7b56301 Merge pull request #2133 from poettering/import-drop-dkr

Makefile.am | 2 -
TODO | 4 -
configure.ac | 9 -
man/machinectl.xml | 70 +-
shell-completion/bash/machinectl | 2 +-
shell-completion/zsh/_machinectl | 4 +-
src/import/importd.c | 123 +--
src/import/org.freedesktop.import1.conf | 4 -
src/import/pull-dkr.c | 1346 -------------------------------
src/import/pull-dkr.h | 38 -
src/import/pull.c | 128 +--
src/machine/machinectl.c | 90 +--
src/shared/import-util.c | 52 --
src/shared/import-util.h | 6 -
14 files changed, 16 insertions(+), 1862 deletions(-)

Upstream: github.com

  • Share