The current format is very useful information to get from bug reports
so add it as default output to swupd update.
Signed-off-by: William Douglas <william.douglas@intel.com>
In order to get the content needed for check-update with the --verbose
option, root is required as data is put into the statedir. Keep the
old behavior when verbose isn't passed.
This was change was required because of the new latest file handling
for --incremental.
Signed-off-by: William Douglas <william.douglas@intel.com>
This release contains:
* Add ability to handle bundle deletes outside of format bumps
* Add new instructions for cleaning up orphaned bundles
Signed-off-by: William Douglas <william.douglas@intel.com>
The mechanism used to convert bats tests to something shellcheck can
verify caused a large number of failures due to the introduction of
testing for if a call is possible. Given the tests aren't called in
a normal shell script way, it is best to just ignore this error for
bats files.
Also fix an index using '$' unnecessarily.
Signed-off-by: William Douglas <william.douglas@intel.com>
When a bundle is removed, ensure the new orphans created are detected
by bundle-list and bundle-remove.
Signed-off-by: William Douglas <william.douglas@intel.com>
Includes needed dev packages and an ignore for error messages seen on
Ubuntu's version of curl but not in Clear Linux.
Signed-off-by: William Douglas <william.douglas@intel.com>
Allow users to update by stepping through each release between their
current version and the latest. This option is primarily for cases
where update is failing due to memory or disk space running out when
updating normally.
Signed-off-by: William Douglas <william.douglas@intel.com>
When allocating the buffer for a version string, the size should be
one greater than the max string size as the null string is inserted at
the content size index which leads to a buffer overflow.
Signed-off-by: William Douglas <william.douglas@intel.com>
Enable an alternative swupd certificate location (the location of the
default or given cert with an ".alt" appended to it). The purpose of
this change is to allow more reliable and flexible key rotations.
If either the main cert or alt cert fails when doing content
verification then the other will be tried (and be used for the next
operation). In this way, as long as both certs don't fail for the same
content verification, progress can be made with either cert.
Signed-off-by: William Douglas <william.douglas@intel.com>
We already detect and report that certain tests require at least two
builds within the current format, but only one exists. Change that from
a test *failure* to a *skip*.
Example:
We need at least 2 versions in format 38 to continue with this test
Test teardown complete.
not ok 2 RCT002: Repair a big system
# (from function `test_setup' in file test/real_content/real_content_lib.bash, line 144,
# from function `setup' in test file test/real_content/../functional/testlib.bash, line 4647)
# `test_setup' failed
#
becomes:
ok 2 RCT002: Repair a big system # skip We need at least 2 versions in format 38 to continue with this test
This test creates an alternate swupd root certificate. If one already
exists, back it up, and restore it when the test is done. Previously,
this test just blindly deleted the certificate if it existed.
- Testing fixups
- Update to use CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
- Recursive delete handle user data gracefully
- Rework curl error checking
Signed-off-by: William Douglas <william.douglas@intel.com>
Eliminate some uses of wc -l that don't help. Take advantage of lines
array to count bundles.
Separate STDERR messages from $output and ${lines[@]} that are used for
bundles.
Previously, these messages were printed to STDOUT:
Overriding version and content URLs with...
Overriding content URL with...
Overriding version URL with...
But especially with --quiet, the output to STDOUT should be strictly the
requested data. So print these as warnings instead.
Set response explicitly in case of curl_easy_getinfo error (though in
practice the response isn't modified and so program behavior is the
same as before this change).
Signed-off-by: William Douglas <william.douglas@intel.com>
systemctl reports that the timer file is missing now as a return code
4 so update the unknown start number.
Also with this change SWUPD_NO is no longer always returned so add a
new helper to check if a status is one of multiple options.
Signed-off-by: William Douglas <william.douglas@intel.com>
Previous use of CURLINFO_CONTENT_LENGTH_DOWNLOAD is deprecated so
switch to the updated CURLINFO_CONTENT_LENGTH_DOWNLOAD_T API.
This change does not propagate the curl type used to the rest of
swupd-client but instead tries to use reasonable type casts for their
given purpose.
Signed-off-by: William Douglas <william.douglas@intel.com>
Currently sys_rm_recursive was used in any instance of deleting swupd
content from the system (update, repair and bundle-remove). This can
cause user data loss when unkown files are in directories that swupd
is deleting.
To prevent this, this patch changes how deleting content in swupd
operates. Swupd content removal is now done with sys_rm and the return
value is checked in case the removal failed due to a directory that
still had files in it. When this specific failure occurs, the
directory is added to a new list for reprocessing removals as it is
expected once the rest of the deletes on the system occur the failures
will go away as the directories will be empty (these deletes are
processed in alphabetical reverse order so leaf directories are
processed first). If the removal fails again it is presumed the
contents of the directory are not files swupd knows about and as such
should be kept somewhere else.
For handling the retention of user data, directories (with only the
content unknown to swupd) are renamed (currently using a
.deleted.$timestamp. prefix of the old name) and stored at the same
directory level they were previously found with one exception. The
exception is for nested deleted content best illustrated with an
example:
/swupd-dir1/user-file1
/swupd-dir1/swupd-dir2/user-file2
When swupd tries to remove the /swupd-dir1 content, it will store the
user files as follows:
/.deleted.$timestamp1.swupd-dir1/user-file1
/.deleted.$timestamp1.swupd-dir1/.deleted.$timestamp1.swupd-dir2/user-file2
To demarcate what was part of swupd content vs user content.
Signed-off-by: William Douglas <william.douglas@intel.com>
The remove_files_in_manifest_from_fs function isn't used and was a
user of a rather dangerous recursive remove function. Get rid of it to
avoid potential confusion.
Signed-off-by: William Douglas <william.douglas@intel.com>
In cases where curl perform returns an error but is actually a 400
level response, swupd needs to check curl info to see this. If the
info reveals a 400 level response, return the corresponding download
status error to prevent useless download retries.
Signed-off-by: William Douglas <william.douglas@intel.com>
The error message about skipping unsupported file optimization levels
only needs to be printed once so do that instead of potentially
spamming it.
Signed-off-by: William Douglas <william.douglas@intel.com>
Add support for new APX optimization level. Change increases the
maximim potential optimization level but does not yet allow the files
to be used (installed). get_opt_level_mask still needs to be updated
to account for system supporting the new optimization level (and
adding APX_SKIP_FILE support) before the APX files can be installed.
This change is being done at this time to allow mixer to create these
files without swupd error messages during updates.
Signed-off-by: William Douglas <william.douglas@intel.com>
Instead of having this be a local test, have a format target for the
Makefile and use a github action for clang-format to avoid differences
between developer systems clang-format and runner clang-format
versions.
Signed-off-by: William Douglas <william.douglas@intel.com>
Allow the usage of non-SSE files from manifests. This involves testing
what the currently running system supports for optimized content and
installing the best matching available binary the manifest provides.
There is an exception for operations where the prefix is set to
something other than the rootfs where SSE binaries will be used in all
cases.
Signed-off-by: William Douglas <william.douglas@intel.com>
Robert Dower