From 8a3a2b40840f58e6143cb9248a97be33a7f89374 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Mon, 19 May 2025 19:51:46 +0200 Subject: [PATCH] refs #2047 run dbus --- CHANGELOG.md | 8 +++++++- ogclient/etc/preinit/otherservices.sh | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02826be..1c3b3f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.13.0] - 2025-05-19 + +### Added + +- Run dbus + ## [0.12.0] - 2025-05-18 ### Changed @@ -13,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.11.0] - 2025-05-18 -### Changed +### Added - Run stunnel and point the browser to it diff --git a/ogclient/etc/preinit/otherservices.sh b/ogclient/etc/preinit/otherservices.sh index 4a74bc1..4cbcd12 100755 --- a/ogclient/etc/preinit/otherservices.sh +++ b/ogclient/etc/preinit/otherservices.sh @@ -13,13 +13,21 @@ ogIsEfiActive && mount -t efivarfs none /sys/firmware/efi/efivars # Lanzar servicios complementarios del cliente. echo "${MSG_OTHERSERVICES:-.}" -# Iniciar stunnel, si es necesario. +# Iniciar stunnel if [ -e /etc/stunnel/menu.conf ]; then sed -i -e "s/__OGCORE_IP__/$ogcore/; s/__OGCORE_PORT__/8443/" /etc/stunnel/menu.conf mkdir -p /var/run/stunnel4; chown stunnel4:stunnel4 /var/run/stunnel4 stunnel /etc/stunnel/menu.conf &>/var/log/stunnel4/menu.log & fi +# Iniciar dbus +if [ -e /etc/dbus-1/system.d/ogbrowser.conf ]; then + mkdir -p /run/dbus + DBUS_SESSION_BUS_ADDRESS=$(dbus-daemon --print-address --system --nosyslog) + export DBUS_SESSION_BUS_ADDRESS + dbus-monitor --system &>/var/log/dbus-monitor.log & +fi + # Iniciar rsyslog, si es necesario. [ -S /dev/log ] || service rsyslog start