wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-17 10:49:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop mdevd plugin, not needed since notify:s6 support was added

Browse Source 
For an example how to set it up, see the finit-skel repository:

https://github.com/troglobit/finit-skel/blob/main/skel/etc/finit.d/available/mdevd.conf

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2022-12-21 11:57:48 +01:00
1 parent 4c90b51d80
commit f6bfbc86e9
6 files changed
+15 -153
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/Makefile.am
-8
View File
@@ -21,10 +21,6 @@ if BUILD_HOTPLUG_PLUGIN
libplug_la_SOURCES += hotplug.c
endif
if BUILD_MDEVD_PLUGIN
libplug_la_SOURCES += mdevd.c
endif
if BUILD_MODULES_LOAD_PLUGIN
libplug_la_SOURCES += modules-load.c
endif
@@ -76,10 +72,6 @@ if BUILD_HOTPLUG_PLUGIN
pkglib_LTLIBRARIES += hotplug.la
endif
if BUILD_MDEVD_PLUGIN
pkglib_LTLIBRARIES += mdevd.la
endif
if BUILD_MODULES_LOAD_PLUGIN
pkglib_LTLIBRARIES += modules-load.la
endif
plugins/hotplug.c
+1 -17
View File
@@ -39,21 +39,6 @@ static void setup(void *arg)
return;
}
/*
* If the mdevd plugin is enabled and loaded we assume this
* system is mdevd based, skipping below udev/mdev checks.
*/
if (plugin_find("mdevd")) {
path = which("mdevd-coldplug");
if (path) {
snprintf(cmd, sizeof(cmd), "cgroup.system [S] <service/mdevd/ready> log %s "
" -- Populating device tree", path);
service_register(SVC_TYPE_RUN, cmd, global_rlimit, NULL);
free(path);
}
return;
}
/*
* Populate /dev and prepare for runtime events from kernel.
* Prefer udev if mdev is also available on the system.
@@ -105,13 +90,12 @@ static void setup(void *arg)
}
}
/* mdevd optional, if installed & loaded changes behavior of setup() */
static plugin_t plugin = {
.name = __FILE__,
.hook[HOOK_BASEFS_UP] = {
.cb = setup
},
.depends = { "bootmisc", "mdevd", "modprobe" },
.depends = { "bootmisc", "modprobe" },
};
PLUGIN_INIT(plugin_init)
plugins/mdevd.c
-123
View File
@@ -1,123 +0,0 @@
/* Setup and start system hotplug helper mdevd
*
* Portions Copyright (c) 2012-2022 Joachim Wiberg <troglobit@gmail.com>
* Portions Copyright (c) 2022 Andy Savage <andy@savage.hk>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <sys/types.h>
#ifdef _LIBITE_LITE
# include <libite/lite.h>
#else
# include <lite/lite.h>
#endif
#include "finit.h"
#include "config.h"
#include "helpers.h"
#include "plugin.h"
#include "service.h"
#include "conf.h"
#define MDEVD_DAEMON "mdevd"
/* Rebroadcast events onto nlgroup 4 */
#define MDEVD_ARGS "-C -O 4 -D %n"
#define MDEVD_DESC "MDEVD Extended Hotplug Daemon"
#ifndef MDEVD_DAEMONUSER
#define MDEVD_DAEMONUSER "root"
#endif
#ifndef MDEVD_DAEMONGROUP
#define MDEVD_DAEMONGROUP "root"
#endif
#ifndef MDEVD_DAEMONPIDFILE
#define MDEVD_DAEMONPIDFILE "/var/run/mdevd.pid"
#endif
static void setup(void *arg)
{
char line[256];
mode_t prev;
char *cmd;
FILE *fp;
if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__);
return;
}
cmd = which(MDEVD_DAEMON);
if (!cmd) {
dbg("Skipping plugin, %s is not installed.", MDEVD_DAEMON);
return;
}
prev =umask(0);
/* Clean up from any previous pre-bootstrap run */
remove(MDEVD_DAEMONPIDFILE);
/* Set hotplug helper */
fp = fopen("/proc/sys/kernel/hotplug", "w");
if (fp) {
fputc('\n', fp);
fclose(fp);
}
/* Register service with Finit */
if (debug)
snprintf(line, sizeof(line), "[S12345789] cgroup.system notify:s6 pid:!%s @%s:%s %s -v3 %s -- %s",
MDEVD_DAEMONPIDFILE, MDEVD_DAEMONUSER, MDEVD_DAEMONGROUP, cmd, MDEVD_ARGS, MDEVD_DESC);
else
snprintf(line, sizeof(line), "[S12345789] cgroup.system notify:s6 pid:!%s @%s:%s %s %s -- %s",
MDEVD_DAEMONPIDFILE, MDEVD_DAEMONUSER, MDEVD_DAEMONGROUP, cmd, MDEVD_ARGS, MDEVD_DESC);
if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL))
err(1, "Failed registering %s", MDEVD_DAEMON);
free(cmd);
umask(prev);
}
static plugin_t plugin = {
.name = __FILE__,
.hook[HOOK_BASEFS_UP] = {
.cb = setup
},
.depends = { "bootmisc", },
};
PLUGIN_INIT(plugin_init)
{
plugin_register(&plugin);
}
PLUGIN_EXIT(plugin_exit)
{
plugin_unregister(&plugin);
}
/**
* Local Variables:
* indent-tabs-mode: t
* c-file-style: "linux"
* End:
*/