diff options
| author | Colin Walters <walters@verbum.org> | 2020-04-21 19:25:40 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2020-04-22 14:09:54 +0000 |
| commit | 368574b6577c9039887e207be1c0501d4c4ef8d0 (patch) | |
| tree | c989ae1f0d5874f7bf8394b896efde480a62471c /Makefile-tests.am | |
| parent | 391ad0ec214ac4065348165ee2d88c3fdb50bf82 (diff) | |
| download | ostree-368574b6577c9039887e207be1c0501d4c4ef8d0.tar.gz | |
deploy: Add --no-merge
All of the underlying libostree APIs have supported passing `NULL`
for a merge deployment for...a long time. But we never plumbed
it up into the CLI.
Add a `--no-merge` option to aid people who want to do a "factory reset":
https://github.com/ostreedev/ostree/issues/1793
Diffstat (limited to 'Makefile-tests.am')
| -rw-r--r-- | Makefile-tests.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile-tests.am b/Makefile-tests.am index 3270bd9c..a172f015 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -102,6 +102,7 @@ _installed_or_uninstalled_test_scripts = \ tests/test-admin-deploy-etcmerge-cornercases.sh \ tests/test-admin-deploy-uboot.sh \ tests/test-admin-deploy-grub2.sh \ + tests/test-admin-deploy-nomerge.sh \ tests/test-admin-deploy-none.sh \ tests/test-admin-deploy-bootid-gc.sh \ tests/test-admin-instutil-set-kargs.sh \ |