keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Port rpmostree-builtin-ex to C++

Browse Source 
Prep for using https://cxx.rs/
This commit is contained in:
Colin Walters 2020-12-21 16:08:51 +00:00 committed by OpenShift Merge Robot
parent c3cff4f8f4
commit 5259323161
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-rpm-ostree.am
View File

@ -38,7 +38,7 @@ rpm_ostree_SOURCES = src/app/main.cxx \
src/app/rpmostree-builtin-reset.cxx \
src/app/rpmostree-pkg-builtins.cxx \
src/app/rpmostree-builtin-status.cxx \
src/app/rpmostree-builtin-ex.c \
src/app/rpmostree-builtin-ex.cxx \
src/app/rpmostree-builtin-testutils.c \
src/app/rpmostree-builtin-shlib-backend.c \
src/app/rpmostree-builtin-db.c \

14
src/app/rpmostree-builtin-ex.c → src/app/rpmostree-builtin-ex.cxx
View File

@ -23,23 +23,23 @@
#include "rpmostree-ex-builtins.h"
static RpmOstreeCommand ex_subcommands[] = {
{ "livefs", RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT | RPM_OSTREE_BUILTIN_FLAG_HIDDEN,
{ "livefs", (RpmOstreeBuiltinFlags)(RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT | RPM_OSTREE_BUILTIN_FLAG_HIDDEN),
"Apply pending deployment changes to booted deployment",
rpmostree_ex_builtin_livefs },
{ "apply-live", RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
{ "apply-live", (RpmOstreeBuiltinFlags)RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
"Apply pending deployment changes to booted deployment",
rpmostree_ex_builtin_livefs },
#ifdef BUILDOPT_ROJIG
{ "commit2rojig", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
{ "commit2rojig", (RpmOstreeBuiltinFlags)RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
"Convert an OSTree commit into an rpm-ostree rojig", rpmostree_ex_builtin_commit2rojig },
{ "rojig2commit", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
{ "rojig2commit", (RpmOstreeBuiltinFlags)RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
"Convert an rpm-ostree rojig into an OSTree commit", rpmostree_ex_builtin_rojig2commit },
#endif
{ "history", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
{ "history", (RpmOstreeBuiltinFlags)RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
"Inspect rpm-ostree history of the system", rpmostree_ex_builtin_history },
{ "initramfs-etc", RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
{ "initramfs-etc", (RpmOstreeBuiltinFlags)RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
"Track initramfs configuration files", rpmostree_ex_builtin_initramfs_etc },
{ NULL, 0, NULL, NULL }
{ NULL, (RpmOstreeBuiltinFlags)0, NULL, NULL }
};
/*