staging/981213/package/base-files, branch main

base-files: sysupgrade: handle errors when generating backup

2024-03-05T10:54:55Z

1. Return error if any step of generating tar file fails 2. Use pipefail to avoid calling "gzip" if tar failed Fixes: e36cc530927c ("base-files: sysupgrade: use tar helper to include installed_packages.txt") Reported-by: Luiz Angelo Daros de Luca Cc: Luiz Angelo Daros de Luca Cc: Jo-Philipp Wich Signed-off-by: Rafał Miłecki

base-files: sysupgrade: allow overriding config restore

2024-03-04T15:27:39Z

Some platforms like Raspberry Pi require patching some backup files like cmdline.txt in order to set the correct root PARTUUID. Signed-off-by: Álvaro Fernández Rojas

base-files: sysupgrade: fix streaming backup archives to stdout

2024-03-04T13:58:10Z

Due to previous refactoring in sysupgrade, writing backup archives to stdout became impossible since the hardcoded gzip output redirection did not account for the `-` special case filename. Fix this issue by substituting `-` with `/proc/self/fd/1` in the tar archive output path variable. Also remove a redundant `rm -f` of the target file path that occurs before the file could've possibly been written. Fixes: #14773 Fixes: https://github.com/openwrt/luci/issues/6961 Fixes: e36cc53092 ("base-files: sysupgrade: use tar helper to include installed_packages.txt") Signed-off-by: Jo-Philipp Wich

base-files: sysupgrade: add uci-defaults script disabling services #2

2024-02-29T15:12:06Z

Disabled services should be kept disabled after sysupgrade. This can be easily handled using a proper uci-defaults script. Extend sysupgrade to check for disabled services, generate uci-defaults script disabling them and include it in backup. Cc: Christian Marangi Cc: Jo-Philipp Wich Cc: Jonas Gorski Signed-off-by: Rafał Miłecki Acked-by: Jo-Philipp Wich

base-files: sysupgrade: use tar helper to include installed_packages.txt

2024-02-29T15:12:06Z

Replace mount + overlay with manually built tar archive that gets prepended to the actual config files backup. This allows more flexibility with including extra backup files. They can be included at any paths and don't require writing to flash or mounting an overlay which has its own limitations (mount points). Signed-off-by: Rafał Miłecki Acked-by: Jo-Philipp Wich

base-files: sysupgrade: add tar.sh with helpers for building archives

2024-02-29T15:11:47Z

This allows building uncompressed tar archives from shell scripts (and compressing them later if needed) Signed-off-by: Jo-Philipp Wich [rmilecki: adapt to sysupgrade needs] Signed-off-by: Rafał Miłecki

base-files: export whole disk of fitblk backing partition

2024-02-26T04:01:10Z

After commit ad62247800 ("base-files: improve lib/upgrade/common.sh") behavior of export_bootdevice has been made consistent in such way that always the whole disk device is exported (as that was the case already when matching via UUID) rather than the partition device. Do the same for the device holding the fitblk backing partition. Fixes: 5992f976b3 ("base-files: recognize bootdevice on devices using fitblk") Signed-off-by: Daniel Golle

base-files: recognize bootdevice on devices using fitblk

2024-02-26T01:29:22Z

Boards using the fitblk driver need special treatment when it comes to detecting the actual block device used to store the image used to boot from. Transparently handle this in 'export_bootdevice' and provide new 'fitblk_get_bootdev' function to replace implementations in /lib/upgrade/platform.sh. Signed-off-by: Daniel Golle

base-files: sysupgrade: rename add_*files() functions

2024-02-22T21:19:13Z

Usage of word "add" was somehow misleading in those functions: 1. They don't really add (as in: append) anything. Result files are created from scratch. 2. It wasn't clear what adding files means. It could be understood as adding actual files somewhere (to existing archive?). Also the word "add" was also a bit ambiguous. Signed-off-by: Rafał Miłecki

base-files: sysupgrade: s/do_save_conffiles/create_backup_archive/

2024-02-22T21:19:01Z

Rename function to more accurate and self-explanatory name: 1. Use "archive" in name as this functions creates tar archive 2. Avoid "conffiles" as this function may archive more than that Signed-off-by: Rafał Miłecki