Merge pull request #1164 from kernelkit/rauc-fixes

Rauc integration fixes

Author: troglobit

board/aarch64/rootfs/etc/rauc/system.conf

@@ -6,6 +6,12 @@ mountprefix=/var/lib/rauc/mnt
 bundle-formats=-plain
 max-bundle-download-size=1073741824
 
+[log.event-log]
+filename=/var/log/upgrade-json.log
+format=json-pretty
+max-size=1M
+max-files=5
+
 [keyring]
 directory=/etc/rauc/keys
 

board/common/rootfs/etc/finit.d/available/rauc.conf

@@ -1,5 +1,5 @@
 set G_MESSAGES_DEBUG=nocolor
 service [2345] <service/dbus/running> \
-	env:-/etc/default/rauc log:prio:user.notice \
+	env:-/etc/default/rauc  \
 	rauc service $RAUC_ARGS -- Software update service
 

board/riscv64/rootfs/etc/rauc/system.conf

@@ -6,6 +6,12 @@ mountprefix=/var/lib/rauc/mnt
 bundle-formats=-plain
 max-bundle-download-size=1073741824
 
+[log.event-log]
+filename=/var/log/upgrade-json.log
+format=json-pretty
+max-size=1M
+max-files=5
+
 [keyring]
 directory=/etc/rauc/keys
 

board/x86_64/rootfs/etc/rauc/system.conf

@@ -7,6 +7,12 @@ mountprefix=/var/lib/rauc/mnt
 bundle-formats=-plain
 max-bundle-download-size=1073741824
 
+[log.event-log]
+filename=/var/log/upgrade-json.log
+format=json-pretty
+max-size=1M
+max-files=5
+
 [keyring]
 directory=/etc/rauc/keys
 

doc/ChangeLog.md

@@ -20,6 +20,7 @@ All notable changes to the project are documented in this file.
 - cli: new `terminal reset` and `terminal resize` convenience commands
 
 ### Fixes
+- Fix #1080: Error message in log from rauc, deprecated 'Install' D-Bus method
 - Fix #1100: Reduce DHCP client logging verbosity by 70% and include interface
   names in log messages for easier troubleshooting
 - Fix #1119: CLI UX regression, restore proper behavior for `no enabled` command

src/confd/src/infix-system-software.c

@@ -31,14 +31,18 @@ static int infix_system_sw_install(sr_session_ctx_t *session, uint32_t sub_id,
 	sr_error_t srerr = SR_ERR_OK;
 	GError *raucerr = NULL;
 	RaucInstaller *rauc;
+	GVariant *args;
 
 	DEBUG("url:%s", url);
 
 	rauc = infix_system_sw_new_rauc();
 	if (!rauc)
 		return SR_ERR_INTERNAL;
 
-	rauc_installer_call_install_sync(rauc, url, NULL, &raucerr);
+	/* Empty args dictionary for InstallBundle method, for now. */
+	args = g_variant_new("a{sv}", NULL);
+
+	rauc_installer_call_install_bundle_sync(rauc, url, args, NULL, &raucerr);
 	if (raucerr) {
 		sr_session_set_netconf_error(session, "application", "operation-failed",
 					     NULL, NULL, raucerr->message, 0);