mirror of
https://github.com/troglobit/finit.git
synced 2026-10-12 10:12:32 +00:00
Joachim Nilsson
65c9e7ebc6
Restructure start by calling the plugin loader earlier. This makes it
possible to run hooks even earlier. This also adds a new hook:
HOOK_ROOTFS_UP which runs as soon as the system root (/) is available.
Another very notable change is the slow refactor of helpers.c into a finit
helper library called libite.so (-lite). This is a light-weight
Also, lots of misc. fixes all over the place. Signal handling still really
needs to be looked into once more!
Makefile:
Add dependency handling for parallell build
Add libite library
ChangeLog:
Update with new 1.4 release. There is a lot of fixes!
libite/:
Collection of utility functions and C library extensions for
finit & its plugins
reboot.c:
New reboot tool. Simply sends SIGINT to PID 1
finit.h:
Cleanup old LISTEN_INITCTL define, code is in an optional plugin now
finit.c:
Let mdev/udev run *after* cls()
Add useful debug statement for /proc/cmdline
Earlier plugin load => new early hook point
Show OK/FAIL for total plugin load, not for each plugin => speedup
helpers.h:
Rename syslog macros to prevent common name clashes (DEBUG/ERROR)
Add __FILE__ to _e(), _d() and _pe() macros
helpers.c:
In ifconfig() the addr and mask arguments are now optional
The copyfile() has been moved to libite.so
Temporarily remove const directive from some functions to build
Use DFLSIG() macro in run_getty() to simplify code
plugin.h:
Add new HOOK_ROOTFS_UP hook
plugin.c:
Fix init_plugins() to actually register the plugin's I/O fd
Skip verbose listing of all plugins in plugin_load_all()
svc.c:
svc_start(): Dito
plugins/Makefile:
Inherit CFLAGS and LDFLAGS, but make sure to filter out -rdynamic
from LDFLAGS, it's used by the daemon, only
plugins/initctl.c:
New includes after helpers.h refactor
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
103 lines
3.7 KiB
C
103 lines
3.7 KiB
C
/* Misc. utility functions and C-library extensions for finit and its plugins
|
|
*
|
|
* 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_HELPERS_H_
|
|
#define FINIT_HELPERS_H_
|
|
|
|
#include <stdio.h>
|
|
#include <syslog.h>
|
|
|
|
#define DO_LOG(level, fmt, args...) \
|
|
{ \
|
|
openlog("finit", LOG_CONS | LOG_PID, LOG_DAEMON); \
|
|
syslog(level, fmt, ##args); \
|
|
closelog(); \
|
|
}
|
|
|
|
#define FLOG_DEBUG(fmt, args...) DO_LOG(LOG_DEBUG, fmt, ##args)
|
|
#define FLOG_ERROR(fmt, args...) DO_LOG(LOG_CRIT, fmt, ##args)
|
|
#define FLOG_PERROR(fmt, args...) DO_LOG(LOG_CRIT, fmt ". Error %d: %s", ##args, errno, strerror(errno))
|
|
|
|
|
|
#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 UNUSED
|
|
#define UNUSED(x) UNUSED_ ## x __attribute__ ((unused))
|
|
#endif
|
|
|
|
#define echo(fmt, args...) do { if (verbose) { 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:%s() - " fmt "\n", __FILE__, __func__, ##args); } while (0)
|
|
#define _pe(fmt, args...) do { fprintf(stderr, "finit:%s:%s() - " fmt ". Error %d: %s\n", __FILE__, __func__, ##args, errno, strerror(errno)); } while (0)
|
|
|
|
extern int debug;
|
|
extern int verbose;
|
|
|
|
int makepath (char *path);
|
|
void ifconfig (char *ifname, char *addr, char *mask, int up);
|
|
|
|
pid_t pidfile_read (char *pidfile);
|
|
pid_t pidfile_poll (char *cmd, char *path);
|
|
|
|
int pid_alive (pid_t pid);
|
|
char *pid_get_name (pid_t pid, char *name, size_t len);
|
|
|
|
void procname_set (char *name, char *args[]);
|
|
int procname_kill (char *name, int signo);
|
|
|
|
void print_desc (char *action, char *desc);
|
|
int print_result (int fail);
|
|
int start_process (char *cmd, char *args[], int console);
|
|
void cls (void);
|
|
void chomp (char *str);
|
|
int getuser (char *username);
|
|
int getgroup (char *group);
|
|
void set_hostname (char *hostname);
|
|
|
|
int run (char *cmd);
|
|
int run_interactive (char *cmd, char *fmt, ...);
|
|
pid_t run_getty (char *cmd, char *argv[]);
|
|
int run_parts (char *dir, ...);
|
|
|
|
/* strlcpy.c */
|
|
size_t strlcpy(char *dst, const char *src, size_t siz);
|
|
|
|
#endif /* FINIT_HELPERS_H_ */
|
|
|
|
/**
|
|
* Local Variables:
|
|
* version-control: t
|
|
* indent-tabs-mode: t
|
|
* c-file-style: "linux"
|
|
* End:
|
|
*/
|