main: Move "rpm-ostree container" → "rpm-ostree ex container"

Now all of our "experimental" bits are under one roof, so we get consistent
handling for them.

Closes: coreos#683
Approved by: jlebon

src/app/main.c

@@ -68,8 +68,6 @@ static RpmOstreeCommand commands[] = {
   /* Experimental */
   { "ex", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_EXPERIMENTAL,
     rpmostree_builtin_ex },
-  { "container", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_EXPERIMENTAL,
-    rpmostree_builtin_container },
   /* Hidden */
   { "start-daemon", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT |
                    RPM_OSTREE_BUILTIN_FLAG_HIDDEN,

src/app/rpmostree-builtin-ex.c

@@ -21,11 +21,14 @@
 #include "config.h"
 
 #include "rpmostree-ex-builtins.h"
+#include "rpmostree-container-builtins.h"
 #include "rpmostree-rpm-util.h"
 
 static RpmOstreeCommand ex_subcommands[] = {
   { "unpack", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
     rpmostree_ex_builtin_unpack },
+  { "container", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
+    rpmostree_builtin_container },
   { NULL, 0, NULL }
 };
 

tests/check/test-ucontainer.sh

@@ -23,7 +23,7 @@ set -euo pipefail
 
 echo "1..2"
 
-rpm-ostree container init
+rpm-ostree ex container init
 
 cp ${commondir}/compose/test-repo.repo rpmmd.repos.d
 
@@ -34,7 +34,7 @@ packages=empty
 repos=test-repo
 EOF
 
-rpm-ostree container assemble empty.conf
+rpm-ostree ex container assemble empty.conf
 assert_has_dir roots/empty.0
 ostree --repo=repo rev-parse empty
 echo "ok assemble"
@@ -44,7 +44,7 @@ cat >nobranch.conf <<EOF
 packages=empty
 repos=test-repo
 EOF
-if rpm-ostree container assemble nobranch.conf 2>err.txt; then
+if rpm-ostree ex container assemble nobranch.conf 2>err.txt; then
     assert_not_reached "nobranch.conf"
 fi
 
@@ -54,7 +54,7 @@ ref=empty
 packages=
 repos=test-repo
 EOF
-if rpm-ostree container assemble nopackages.conf 2>err.txt; then
+if rpm-ostree ex container assemble nopackages.conf 2>err.txt; then
     assert_not_reached "nopackages.conf"
 fi
 
@@ -63,7 +63,7 @@ cat >norepos.conf <<EOF
 ref=empty
 packages=empty
 EOF
-if rpm-ostree container assemble norepos.conf 2>err.txt; then
+if rpm-ostree ex container assemble norepos.conf 2>err.txt; then
     assert_not_reached "norepos.conf"
 fi
 
@@ -73,7 +73,7 @@ ref=notfound
 packages=notfound
 repos=test-repo
 EOF
-if rpm-ostree container assemble notfound.conf 2>err.txt; then
+if rpm-ostree ex container assemble notfound.conf 2>err.txt; then
     assert_not_reached "notfound.conf"
 fi