mirror of
https://github.com/troglobit/finit.git
synced 2026-10-01 13:33:09 +07:00
Migrate testserv plugin to a couple of lines of ASCII .conf files
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
+1
-1
@@ -1,5 +1,5 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
SUBDIRS = man plugins src test tmpfiles.d
|
||||
SUBDIRS = man plugins src system test tmpfiles.d
|
||||
doc_DATA = README.md LICENSE contrib/finit.conf
|
||||
EXTRA_DIST = README.md LICENSE ChangeLog.md contrib/finit.conf
|
||||
|
||||
|
||||
@@ -41,10 +41,6 @@ if BUILD_RTC_PLUGIN
|
||||
libplug_la_SOURCES += rtc.c
|
||||
endif
|
||||
|
||||
if BUILD_TESTSERV_PLUGIN
|
||||
libplug_la_SOURCES += testserv.c
|
||||
endif
|
||||
|
||||
if BUILD_TTY_PLUGIN
|
||||
libplug_la_SOURCES += tty.c
|
||||
endif
|
||||
@@ -96,10 +92,6 @@ if BUILD_RTC_PLUGIN
|
||||
pkglib_LTLIBRARIES += rtc.la
|
||||
endif
|
||||
|
||||
if BUILD_TESTSERV_PLUGIN
|
||||
pkglib_LTLIBRARIES += testserv.la
|
||||
endif
|
||||
|
||||
if BUILD_TTY_PLUGIN
|
||||
pkglib_LTLIBRARIES += tty.la
|
||||
endif
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
/* Test plugin, only used for `make check`, not for public use
|
||||
*
|
||||
* Copyright (c) 2023 Joachim Wiberg <troglobit@gmail.com>
|
||||
*
|
||||
* 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 SERV_DAEMON "serv"
|
||||
#define SERV_ARGS "-n -p -i testserv"
|
||||
#define SERV_DESC "Test serv daemon"
|
||||
|
||||
static void setup(void *arg)
|
||||
{
|
||||
char line[256];
|
||||
mode_t prev;
|
||||
char *cmd;
|
||||
|
||||
if (rescue) {
|
||||
dbg("Skipping %s plugin in rescue mode.", __FILE__);
|
||||
return;
|
||||
}
|
||||
|
||||
cmd = which(SERV_DAEMON);
|
||||
if (!cmd) {
|
||||
dbg("Skipping plugin, %s is not installed.", SERV_DAEMON);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Clean up from any previous pre-bootstrap run */
|
||||
remove("/run/serv.pid");
|
||||
|
||||
prev = umask(0);
|
||||
mksubsys("/var/run/serv", 0755, "root", "root");
|
||||
mksubsys("/var/run/lock/subsys", 0755, "root", "root");
|
||||
mksubsys("/var/lib/serv", 0755, "root", "root");
|
||||
mksubsys("/tmp/serv", 0755, "root", "root");
|
||||
umask(prev);
|
||||
|
||||
snprintf(line, sizeof(line), "[S123456789] name:testserv pid:!/run/testserv.pid <boot/testserv> cgroup.system %s %s -- %s",
|
||||
cmd, SERV_ARGS, SERV_DESC);
|
||||
|
||||
if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL))
|
||||
err(1, "Failed registering %s", SERV_DAEMON);
|
||||
|
||||
free(cmd);
|
||||
}
|
||||
|
||||
static plugin_t plugin = {
|
||||
.name = __FILE__,
|
||||
.hook[HOOK_SVC_PLUGIN] = { .cb = setup },
|
||||
};
|
||||
|
||||
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:
|
||||
*/
|
||||
@@ -0,0 +1,2 @@
|
||||
Makefile
|
||||
Makefile.in
|
||||
@@ -0,0 +1,6 @@
|
||||
systemdir = $(system_path)
|
||||
dist_system_DATA =
|
||||
|
||||
if BUILD_TESTSERV_PLUGIN
|
||||
dist_system_DATA += testserv.conf
|
||||
endif
|
||||
@@ -0,0 +1,4 @@
|
||||
# Test service, only used for `make check`, not for public use
|
||||
service [S123456789] name:testserv pid:!/run/testserv.pid \
|
||||
<boot/testserv> cgroup.system \
|
||||
/sbin/serv -n -p -i testserv -- Test serv daemon
|
||||
@@ -5,3 +5,7 @@ tmpfilesdir = $(tmpfiles_path)
|
||||
dist_tmpfiles_DATA = etc.conf legacy.conf var.conf x11.conf
|
||||
dist_tmpfiles_DATA += dnsmasq.conf frr.conf lldpd.conf openswan.conf \
|
||||
quagga.conf sshd.conf uuidd.conf
|
||||
|
||||
if BUILD_TESTSERV_PLUGIN
|
||||
dist_tmpfiles_DATA += testserv.conf
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
# Test service, only used for `make check`, not for public use
|
||||
|
||||
d /var/run/serv 0755 - - -
|
||||
d /var/lib/serv 0755 - - -
|
||||
d /tmp/serv 0755 - - -
|
||||
r /run/serv.pid
|
||||
Reference in New Issue
Block a user