From 7fa15cf07891177a2064e05fede8955339654f3e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 8 Jul 2018 13:59:18 +0000 Subject: [PATCH] =?UTF-8?q?app:=20Add=20an=20`update`=20=E2=86=92=20`upgra?= =?UTF-8?q?de`=20alias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same as `dnf` for example, and `flatpak` today uses `update`, so let's do both. Closes: https://github.com/projectatomic/rpm-ostree/issues/1448 Closes: #1449 Approved by: jlebon --- src/app/main.c | 3 +++ tests/vmcheck/test-upgrades.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/app/main.c b/src/app/main.c index b3dbf957..04685ce6 100644 --- a/src/app/main.c +++ b/src/app/main.c @@ -62,6 +62,9 @@ static RpmOstreeCommand commands[] = { { "upgrade", RPM_OSTREE_BUILTIN_FLAG_SUPPORTS_PKG_INSTALLS, "Perform a system upgrade", rpmostree_builtin_upgrade }, + { "update", RPM_OSTREE_BUILTIN_FLAG_SUPPORTS_PKG_INSTALLS | RPM_OSTREE_BUILTIN_FLAG_HIDDEN, + "Alias for upgrade", + rpmostree_builtin_upgrade }, { "reload", 0, "Reload configuration", rpmostree_builtin_reload }, diff --git a/tests/vmcheck/test-upgrades.sh b/tests/vmcheck/test-upgrades.sh index a9384e89..946db38c 100755 --- a/tests/vmcheck/test-upgrades.sh +++ b/tests/vmcheck/test-upgrades.sh @@ -29,6 +29,9 @@ vm_ostreeupdate_prepare_reboot # Test base ostree update vm_ostreeupdate_create v2 +# Test the update → upgrade alias +vm_rpmostree update --check +# Then use the real command vm_rpmostree upgrade vm_reboot vm_start_httpd ostree_server $REMOTE_OSTREE 8888