mirror of
https://github.com/troglobit/finit.git
synced 2026-11-16 19:20:26 +00:00
plugin: start a system bus by default
Finit speaks D-Bus itself now and claims org.finit on the system bus when it finds one, but nothing in a default build ever brings that bus up. The plugin that does was opt-in, so the built-in support sat idle unless the integrator knew to ask for both halves. Defaulting it on is only reasonable if the result stays the admin's to change, and a service registered from C through conf_save_service() is not: it lands in the run path where it cannot be overridden or emptied out. So the daemon moves to 20-dbus.conf and its directories to tmpfiles.d/dbus.conf, the same way hotplug and every other daemon we ship them for. The plugin keeps only what has to look at the running system, the stale pidfile and the machine UUID. Those directories are no longer chowned to messagebus. tmpfiles.d skips a line whose user does not exist rather than falling back, so the plugin's messagebus/dbus/root ladder has no equivalent there, and dbus-daemon binds its socket before dropping privileges anyway. The plugin already bows out where there is no dbus-daemon installed, so systems that never wanted a bus are unaffected, and --disable-dbus-plugin is there for those that have one and would still rather init left it alone. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
9875e76419
commit
2e0b1d6f8b
9 files changed
+61
-72
No files matched your search
+1
-1
@@ -117,7 +117,7 @@ AC_ARG_ENABLE(all_plugins,
|
||||
AS_HELP_STRING([--enable-all-plugins], [Enable all plugins, default: auto]),
|
||||
enable_all_plugins=$enableval, enable_all_plugins=auto)
|
||||
AC_PLUGIN([alsa-utils], [no], [Save and restore ALSA sound settings using alsactl])
|
||||
AC_PLUGIN([dbus], [no], [Setup and start system message bus, D-Bus])
|
||||
AC_PLUGIN([dbus], [yes], [Setup and start system message bus, D-Bus])
|
||||
AC_PLUGIN([modules-load], [no], [Scans /etc/modules-load.d for modules to load])
|
||||
AC_PLUGIN([modprobe], [no], [Coldplug modules using modalias magic])
|
||||
AC_PLUGIN([resolvconf], [no], [Setup necessary files for resolvconf])
|
||||
|
||||
@@ -8,6 +8,14 @@ All relevant changes are documented in this file.
|
||||
|
||||
### Changes
|
||||
|
||||
- The `dbus.so` plugin, which starts an external `dbus-daemon`, is now
|
||||
enabled by default. It does nothing on systems without a
|
||||
`dbus-daemon` installed, and `--disable-dbus-plugin` opts out. The
|
||||
daemon it used to register from C now lives in `20-dbus.conf`, and
|
||||
the directories it needs in `tmpfiles.d/dbus.conf`, so both can be
|
||||
overridden from `/etc` like any other system file. Those
|
||||
directories are no longer chowned to `messagebus`, matching how
|
||||
Finit ships directories for other daemons
|
||||
- The `tty` block takes `passenv`, which the line-based format has had
|
||||
since v4.4 (issue #286) and the block format was missing
|
||||
- New `provides` setting for run/task/service/sysv blocks, naming
|
||||
|
||||
+7
-5
@@ -53,14 +53,16 @@ Below are a few of the main switches to configure:
|
||||
|
||||
* `--disable-dbus`: Opt out of Finit's built-in D-Bus support, enabled by
|
||||
default. See [D-Bus Integration](dbus.md) for what it provides. Not to
|
||||
be confused with `--enable-dbus-plugin` below, which only starts an
|
||||
external `dbus-daemon`
|
||||
be confused with `--disable-dbus-plugin` below, which only governs
|
||||
starting an external `dbus-daemon`
|
||||
|
||||
* `--enable-alsa-utils-plugin`: Enable the optional `alsa-utils.so` sound plugin.
|
||||
|
||||
* `--enable-dbus-plugin`: Enable the optional D-Bus `dbus.so` plugin, which
|
||||
launches `dbus-daemon` at boot. Unrelated to the built-in bus, see
|
||||
`--disable-dbus` above.
|
||||
* `--disable-dbus-plugin`: Drop the `dbus.so` plugin, which launches
|
||||
`dbus-daemon` at boot. Enabled by default; the plugin does nothing on
|
||||
a system that has no `dbus-daemon` installed, so opting out is only
|
||||
needed to keep init from starting a bus on a system that has one.
|
||||
Unrelated to the built-in bus, see `--disable-dbus` above.
|
||||
|
||||
* `--enable-resolvconf-plugin`: Enable the `resolvconf.so` optional plugin.
|
||||
|
||||
|
||||
+4
-1
@@ -35,7 +35,10 @@ For your convenience a set of *optional* plugins are available:
|
||||
> the `/etc/fstab` file and in the Linux kernel config.
|
||||
|
||||
* *dbus.so*: Setup and start system message bus, D-Bus, at boot.
|
||||
_Optional plugin._
|
||||
Enabled by default, and a no-op on systems without a `dbus-daemon`.
|
||||
The daemon is declared in `20-dbus.conf` and its directories in
|
||||
`tmpfiles.d/dbus.conf`, both overridable from `/etc`; the plugin
|
||||
itself only handles what has to inspect the running system.
|
||||
|
||||
* *hook-scripts.so*: Trigger the execution of scripts from plugin hook
|
||||
points (see [Hooks](#hooks)). _Optional plugin._
|
||||
|
||||
+10
-65
@@ -32,22 +32,11 @@
|
||||
#include "config.h"
|
||||
#include "helpers.h"
|
||||
#include "plugin.h"
|
||||
#include "service.h"
|
||||
#include "util.h"
|
||||
#include "conf.h"
|
||||
#include "util.h"
|
||||
#include "log.h"
|
||||
|
||||
#define DBUS_DAEMON "dbus-daemon"
|
||||
#define DBUS_ARGS "--nofork --system --syslog-only"
|
||||
#define DBUS_DESC "D-Bus message bus daemon"
|
||||
|
||||
#ifndef DBUS_DAEMONUSER
|
||||
#define DBUS_DAEMONUSER "messagebus"
|
||||
#endif
|
||||
|
||||
#ifndef DBUS_DAEMONGROUP
|
||||
#define DBUS_DAEMONGROUP "messagebus"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Dumnpster diving for the D-Bus main configuration file
|
||||
@@ -96,79 +85,35 @@ static char *dbus_pidfn(void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* The directories live in tmpfiles.d/dbus.conf and the service in
|
||||
* system/20-dbus.conf, both of which an administrator can override.
|
||||
* What is left needs to look at the running system, so it stays here.
|
||||
*/
|
||||
static void setup(void *arg)
|
||||
{
|
||||
char *group = DBUS_DAEMONGROUP;
|
||||
char *user = DBUS_DAEMONUSER;
|
||||
char esccmd[256];
|
||||
char pid[300];
|
||||
char *pidfn;
|
||||
mode_t prev;
|
||||
char *cmd;
|
||||
|
||||
if (rescue) {
|
||||
dbg("Skipping %s plugin in rescue mode.", "dbus");
|
||||
return;
|
||||
}
|
||||
|
||||
cmd = which(DBUS_DAEMON);
|
||||
if (!cmd) {
|
||||
if (!whichp(DBUS_DAEMON)) {
|
||||
dbg("Skipping plugin, %s is not installed.", DBUS_DAEMON);
|
||||
return;
|
||||
}
|
||||
|
||||
if (getuser(user, NULL) == -1) {
|
||||
if (getuser("dbus", NULL) == -1)
|
||||
user = "root"; /* fallback */
|
||||
else
|
||||
user = "dbus"; /* e.g., Buildroot */
|
||||
}
|
||||
|
||||
if (getgroup(group) == -1) {
|
||||
if (getgroup("dbus") == -1)
|
||||
group = "root"; /* fallback */
|
||||
else
|
||||
group = "dbus"; /* e.g., Buildroot */
|
||||
}
|
||||
|
||||
/* Clean up from any previous pre-bootstrap run */
|
||||
pidfn = dbus_pidfn();
|
||||
if (pidfn)
|
||||
if (pidfn) {
|
||||
remove(pidfn);
|
||||
|
||||
dbg("Creating D-Bus Required Directories ...");
|
||||
prev = umask(0);
|
||||
mksubsys("/var/run/dbus", 0755, user, group);
|
||||
mksubsys("/var/run/lock/subsys", 0755, user, group);
|
||||
mksubsys("/var/lib/dbus", 0755, user, group);
|
||||
mksubsys("/tmp/dbus", 0755, user, group);
|
||||
umask(prev);
|
||||
free(pidfn);
|
||||
}
|
||||
|
||||
/* Generate machine id for dbus */
|
||||
if (whichp("dbus-uuidgen"))
|
||||
run_interactive("dbus-uuidgen --ensure", "Verifying D-Bus machine UUID");
|
||||
|
||||
/*
|
||||
* Register service with Finit
|
||||
* Note: dbus drops privs after starting up.
|
||||
*/
|
||||
pid[0] = 0;
|
||||
if (pidfn) {
|
||||
char esc[280];
|
||||
|
||||
snprintf(pid, sizeof(pid), "\tpidfile = \"%s\"\n",
|
||||
conf_escape(pidfn, esc, sizeof(esc)));
|
||||
free(pidfn);
|
||||
}
|
||||
conf_save_service(SVC_TYPE_SERVICE, "dbus", "dbus.conf",
|
||||
"\tdescription = \"" DBUS_DESC "\"\n"
|
||||
"\trunlevel = \"S123456789\"\n"
|
||||
"\tnotify = \"none\"\n"
|
||||
"\tcgroup system {}\n"
|
||||
"%s"
|
||||
"\tcommand = \"%s " DBUS_ARGS "\"\n",
|
||||
pid, conf_escape(cmd, esccmd, sizeof(esccmd)));
|
||||
free(cmd);
|
||||
}
|
||||
|
||||
static plugin_t plugin = {
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# System message bus, D-Bus
|
||||
#
|
||||
# The dbus.so plugin creates the directories dbus-daemon needs and makes
|
||||
# sure the machine has a UUID, but the daemon itself is declared here so
|
||||
# you can change it. The leading '-' says it is fine if dbus-daemon is
|
||||
# not installed; the service is then skipped without a warning.
|
||||
#
|
||||
# Finit registers org.finit on this bus once it is up, see docs/dbus.md.
|
||||
#
|
||||
# Override this file by copying it to /etc/finit.d/, using the same name,
|
||||
# then change the contents any way you like, it can even be empty.
|
||||
|
||||
service dbus {
|
||||
description = "D-Bus message bus daemon"
|
||||
runlevel = "S123456789"
|
||||
notify = "none"
|
||||
cgroup system {}
|
||||
command = "-dbus-daemon --nofork --system --syslog-only"
|
||||
}
|
||||
@@ -7,6 +7,10 @@ if BUILD_HOTPLUG_PLUGIN
|
||||
system_DATA += 10-hotplug.conf
|
||||
endif
|
||||
|
||||
if BUILD_DBUS_PLUGIN
|
||||
dist_system_DATA += 20-dbus.conf
|
||||
endif
|
||||
|
||||
if BUILD_TESTSERV_PLUGIN
|
||||
dist_system_DATA += 90-testserv.conf
|
||||
endif
|
||||
@@ -6,6 +6,10 @@ dist_tmpfiles_DATA = etc.conf legacy.conf var.conf
|
||||
dist_tmpfiles_DATA += dnsmasq.conf frr.conf lldpd.conf openswan.conf \
|
||||
quagga.conf sshd.conf uuidd.conf
|
||||
|
||||
if BUILD_DBUS_PLUGIN
|
||||
dist_tmpfiles_DATA += dbus.conf
|
||||
endif
|
||||
|
||||
if BUILD_TESTSERV_PLUGIN
|
||||
dist_tmpfiles_DATA += testserv.conf
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
d /var/run/dbus 0755 - - -
|
||||
d /var/run/lock/subsys 0755 - - -
|
||||
d /var/lib/dbus 0755 - - -
|
||||
d /tmp/dbus 0755 - - -
|
||||
Reference in new issue
Block a user