Skip to content

Commit

Permalink
Remove ex-container
Browse files Browse the repository at this point in the history
I still think we should do this at some point, but
the experiment with using `GKeyfile` for configuration
is IMO a failure and the variety of data formats
(treefile JSON vs YAML vs origin keyfiles vs container keyfiles)
causes a lot of confusion.

Prep for coreos#2326
  • Loading branch information
cgwalters committed Dec 1, 2020
1 parent 887d362 commit 0fc3957
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 239 deletions.
3 changes: 0 additions & 3 deletions Makefile-rpm-ostree.am
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ rpm_ostree_SOURCES = src/app/main.c \
src/app/rpmostree-builtin-status.c \
src/app/rpmostree-builtin-ex.c \
src/app/rpmostree-builtin-testutils.c \
src/app/rpmostree-builtin-container.c \
src/app/rpmostree-builtin-db.c \
src/app/rpmostree-builtin-start-daemon.c \
src/app/rpmostree-builtin-finalize-deployment.c \
Expand All @@ -51,8 +50,6 @@ rpm_ostree_SOURCES = src/app/main.c \
src/app/rpmostree-db-builtin-version.c \
src/app/rpmostree-dbus-helpers.c \
src/app/rpmostree-dbus-helpers.h \
src/app/rpmostree-container-builtins.h \
src/app/rpmostree-container-builtins.c \
src/app/rpmostree-override-builtins.h \
src/app/rpmostree-override-builtins.c \
src/app/rpmostree-libbuiltin.c \
Expand Down
1 change: 0 additions & 1 deletion Makefile-tests.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ uninstalled_test_programs = \

uninstalled_test_scripts = \
tests/check/test-lib-introspection.sh \
tests/check/test-ucontainer.sh \
$(NULL)

uninstalled_test_extra_programs = \
Expand Down
45 changes: 0 additions & 45 deletions src/app/rpmostree-builtin-container.c

This file was deleted.

2 changes: 0 additions & 2 deletions src/app/rpmostree-builtin-ex.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ static RpmOstreeCommand ex_subcommands[] = {
{ "livefs", RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
"Apply pending deployment changes to booted deployment",
rpmostree_ex_builtin_livefs },
{ "container", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
"Assemble local unprivileged containers", rpmostree_builtin_container },
#ifdef BUILDOPT_ROJIG
{ "commit2rojig", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
"Convert an OSTree commit into an rpm-ostree rojig", rpmostree_ex_builtin_commit2rojig },
Expand Down
91 changes: 0 additions & 91 deletions tests/check/test-ucontainer.sh

This file was deleted.

40 changes: 0 additions & 40 deletions tests/ex-container

This file was deleted.

36 changes: 0 additions & 36 deletions tests/ex-container-tests/test-bash.sh

This file was deleted.

21 changes: 0 additions & 21 deletions tests/ex-container-tests/test-httpd.sh

This file was deleted.

0 comments on commit 0fc3957

Please sign in to comment.