mirror of
https://github.com/troglobit/finit.git
synced 2026-10-01 21:42:40 +07:00
Joachim Nilsson
c49d89dfe0
Due to time constraints I had to revert the new libev backend to the
service, I/O and signals monitor. Employed instead is the tried and
tested signals based service monitor, with a small extension for an
additional I/O monitor using poll() for the I/O plugins to use.
Tried restoring the startx finit.conf directive on top of the service
implementation. However, it's currently not usable to run /usr/bin/startx
for any other user than root. I recommend using the examples/finit.conf
and run /usr/sbin/gdm instead.
finit.c:
New run_loop() function, replaces libev ev_run().
helpers.c:
Refactor start_process() into svc_start().
plugin.c:
Add fds[] array for use in the io_monitor() called by the
new run_loop().
signal.c:
Ignore SIGCHLD. Handled by waitpid() in svc_monitor() now,
which is called by the new run_loop().
svc.c:
svc_register(): Optional @username parsing for the command line.
svc_monitor(): Replaced libev callback with waitpid()
svc_start(): Refactored to use most of helpers.c:start_process()
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
127 lines
3.7 KiB
C
127 lines
3.7 KiB
C
/* Improved fast init
|
|
*
|
|
* Copyright (c) 2008-2010 Claudio Matsuoka <cmatsuoka@gmail.com>
|
|
* Copyright (c) 2008-2012 Joachim Nilsson <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.
|
|
*/
|
|
|
|
#ifndef FINIT_H_
|
|
#define FINIT_H_
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
|
|
#include <syslog.h>
|
|
#define DO_LOG(level, fmt, args...) \
|
|
{ \
|
|
openlog("finit", LOG_CONS | LOG_PID, LOG_DAEMON); \
|
|
syslog(LOG_DEBUG, fmt, ##args); \
|
|
closelog(); \
|
|
}
|
|
|
|
#define DEBUG(fmt, args...) DO_LOG(LOG_DEBUG, fmt, ##args)
|
|
#define ERROR(fmt, args...) DO_LOG(LOG_CRIT, fmt, ##args)
|
|
|
|
#define FINIT_FIFO "/dev/initctl"
|
|
#define FINIT_CONF "/etc/finit.conf"
|
|
#define FINIT_RCSD "/etc/finit.d"
|
|
|
|
/* Distribution configuration */
|
|
|
|
#if defined EMBEDDED_SYSTEM
|
|
# define CONSOLE "/dev/console"
|
|
# define MDEV "/sbin/mdev"
|
|
# define GETTY "/sbin/getty -L 115200 ttyS0 vt100"
|
|
# define LISTEN_INITCTL
|
|
#else /* Debian/Ubuntu based distributions */
|
|
# define RANDOMSEED "/var/lib/urandom/random-seed"
|
|
# define CONSOLE "/dev/tty1"
|
|
# define GETTY "/sbin/getty -8 38400 tty1"
|
|
# define REMOUNT_ROOTFS_RW
|
|
# define RUNLEVEL 2
|
|
# define LISTEN_INITCTL
|
|
# define USE_UDEV
|
|
# define USE_MESSAGE_BUS
|
|
#endif
|
|
|
|
#ifndef DEFUSER
|
|
# define DEFUSER "root"
|
|
#endif
|
|
#ifndef DEFHOST
|
|
# define DEFHOST "noname"
|
|
#endif
|
|
|
|
#define CMD_SIZE 256
|
|
#define LINE_SIZE 1024
|
|
#define BUF_SIZE 4096
|
|
#define USERNAME_SIZE 16
|
|
#define HOSTNAME_SIZE 32
|
|
|
|
#ifndef touch
|
|
# define touch(x) mknod((x), S_IFREG|0644, 0)
|
|
#endif
|
|
#ifndef chardev
|
|
# define chardev(x,m,maj,min) mknod((x), S_IFCHR|(m), makedev((maj),(min)))
|
|
#endif
|
|
#ifndef blkdev
|
|
# define blkdev(x,m,maj,min) mknod((x), S_IFBLK|(m), makedev((maj),(min)))
|
|
#endif
|
|
#ifndef fexist
|
|
# define fexist(x) (access(x, F_OK) != -1)
|
|
#endif
|
|
|
|
#ifndef UNUSED
|
|
#define UNUSED(x) UNUSED_ ## x __attribute__ ((unused))
|
|
#endif
|
|
|
|
#define echo(fmt, args...) do { if (1) { fprintf(stderr, fmt "\n", ##args); } } while (0)
|
|
#define _d(fmt, args...) do { if (debug) { fprintf(stderr, "finit:%s() - " fmt "\n", __func__, ##args); } } while (0)
|
|
#define _e(fmt, args...) do { fprintf(stderr, "finit:%s() - " fmt "\n", __func__, ##args); } while (0)
|
|
#define _pe(fmt, args...) do { fprintf(stderr, "finit:%s() - " fmt ". Error %d: %s\n", __func__, ##args, errno, strerror(errno)); } while (0)
|
|
|
|
extern int debug;
|
|
extern int verbose;
|
|
extern char *sdown;
|
|
extern char *network;
|
|
extern char *hostname;
|
|
extern char *username;
|
|
|
|
/* strlcpy.c */
|
|
size_t strlcpy(char *dst, const char *src, size_t siz);
|
|
|
|
/* conf.c */
|
|
void parse_finit_conf(char *file);
|
|
|
|
|
|
#endif /* FINIT_H_ */
|
|
|
|
/**
|
|
* Local Variables:
|
|
* version-control: t
|
|
* indent-tabs-mode: t
|
|
* c-file-style: "linux"
|
|
* End:
|
|
*/
|