From 2135cccc98e0d0a49ad54f1144b373d57cdf6745 Mon Sep 17 00:00:00 2001 From: Kevin Putnam Date: Tue, 3 Jul 2018 10:28:10 -0700 Subject: [PATCH] removed update.rst as material is duplicate of swupd-guide.rst, updated swupd-guide, and updated maintenance.rst to reflect removal update.rst --- .../guides/maintenance/maintenance.rst | 3 +- .../guides/maintenance/swupd-guide.rst | 46 ++++++++---- .../clear-linux/guides/maintenance/update.rst | 70 ------------------- 3 files changed, 35 insertions(+), 84 deletions(-) delete mode 100644 source/clear-linux/guides/maintenance/update.rst diff --git a/source/clear-linux/guides/maintenance/maintenance.rst b/source/clear-linux/guides/maintenance/maintenance.rst index 6cbf1034..76713380 100644 --- a/source/clear-linux/guides/maintenance/maintenance.rst +++ b/source/clear-linux/guides/maintenance/maintenance.rst @@ -10,11 +10,10 @@ maintaining |CLOSIA| after :ref:`installation ` is completed. :maxdepth: 2 enable-user-space - update + swupd-guide bulk-provision mixer mixin - swupd-guide validate-signatures telemetry-enable time diff --git a/source/clear-linux/guides/maintenance/swupd-guide.rst b/source/clear-linux/guides/maintenance/swupd-guide.rst index b70e811d..0c9ef8a0 100644 --- a/source/clear-linux/guides/maintenance/swupd-guide.rst +++ b/source/clear-linux/guides/maintenance/swupd-guide.rst @@ -11,6 +11,13 @@ perform verification of the system software. installing functionality on top of the core operating system. Use the `swupd` tool to install and remove bundles. +This guide assumes: + +* The device is on a well-connected network. + +* The device is able to connect to the release infrastructure + http://update.clearlinux.org + .. contents:: :local: :depth: 2 @@ -23,14 +30,14 @@ For a full listing of commands and options please see the man page in |CL| man swupd -OS Update and Verification +OS update and verification ************************** |CL| is designed to promote a regular update cadence. `swupd` helps to make sure that process is simple and secure. -OS Info -======= +View OS info +============ Current OS version and update server info: @@ -43,26 +50,36 @@ Current OS version and update server info: Version URL: https://download.clearlinux.org/update/ Content URL: https://cdn.download.clearlinux.org/update/ -Disable Automatic Updates -========================= +Enable or disable automatic updates +=================================== -|CL| updates are automatic by default but can be toggled to occur only -on demand. Disable automatic updates: +|CL| updates are automatic by default but can be set to occur only +on demand. To verify your current auto-update setting: + +.. code-block:: bash + + sudo swupd autoupdate + +Disable automatic updates: .. code-block:: bash sudo swupd autoupdate --disable -To re-enable automatic updates use the `--enable` flag. +To re-enable automatic: -Check for Updates +.. code-block:: bash + + sudo swupd autoupdate --enable + +Check for updates ================= .. code-block:: bash sudo swupd check-update -Perform a Manual Update +Perform a manual update ======================= You can update to a specific version or accept the latest as the default with @@ -80,7 +97,12 @@ Output from a successful update: Version on server (23330) is not newer than system version (23330) Update complete. System already up-to-date at version 23330 -System Software Verification +.. note:: + + After a kernel update, reboot immediately for the enhancements to + take effect. + +System software verification ============================ `swupd` can determine whether system directories and files have been added @@ -111,7 +133,7 @@ In this case, python packages that were installed on top of the default install were flagged as mismatched. `swupd` can be directed to ignore or fix issues based on :ref:`command line options `. -Fixing Hash Mismatches +Fixing hash mismatches ====================== `swupd` can correct any issues it detects. Additional directives can be diff --git a/source/clear-linux/guides/maintenance/update.rst b/source/clear-linux/guides/maintenance/update.rst deleted file mode 100644 index 5705fda3..00000000 --- a/source/clear-linux/guides/maintenance/update.rst +++ /dev/null @@ -1,70 +0,0 @@ -.. _update: - -Update Clear Linux -################## - -This section describes how to update |CLOSIA|. - -Prerequisites -============= - -* The system is up and running the Clear Linux 15400 release or later. - -* The device is on a well-connected network. - -* The device is able to connect to the release infrastructure - http://update.clearlinux.org - -To verify the current release running on the system, enter: - -.. code-block:: console - - $ sudo swupd update -s - -How to update the system -======================== - -Starting with version 15400, Clear Linux supports auto-update. By default, it -is turned on. - -To verify the current auto-update setting: - - .. code-block:: console - - $ swupd autoupdate - -To enable auto-update: - - .. code-block:: console - - $ sudo swupd autoupdate --enable - -To disable auto-update: - - .. code-block:: console - - $ sudo swupd autoupdate --disable - -To force a manual update: - - .. code-block:: console - - $ sudo swupd update - -.. note:: - - When the swupd console output indicates a kernel update, reboot - immediately for the enhancements to take effect. - - -Additional information -====================== - -To see the man page listing additional swupd options, install the -`sysadmin-basic` bundle to access the `man` command and later access -the man page: - - .. code-block:: console - - $ sudo swupd bundle-add sysadmin-basic - $ man swupd