wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-06 15:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename USE_UDEV & MDEV to SETUP_DEVFS and USE_MESSAGE_BUS to HAVE_DBUS

Browse Source 
USE_UDEV,MDEV   => Unique SETUP_DEVFS for embedded or distro usage.
USE_MESSAGE_BUS => HAVE_DBUS

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2013-06-04 07:21:08 +02:00
1 parent bf0cfe0693
commit e776838de9
3 files changed
+12 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

finit.c
+1 -5
View File
@@ -186,11 +186,7 @@ int main(int argc, char* argv[])
/* /*
* Populate /dev and prepare for runtime events from kernel. * Populate /dev and prepare for runtime events from kernel.
*/ */
#if defined(USE_UDEV) run_interactive(SETUP_DEVFS, "Populating device tree");
run_interactive("udevd --daemon", "Populating device tree");
#elif defined (MDEV)
run_interactive(MDEV " -s", "Populating device tree");
#endif
/* /*
* Parse configuration file * Parse configuration file
finit.h
+10 -10
View File
@@ -1,7 +1,7 @@
/* Finit - Extremely fast /sbin/init replacement w/ I/O, hook & service plugins /* Finit - Extremely fast /sbin/init replacement w/ I/O, hook & service plugins
* *
* Copyright (c) 2008-2010 Claudio Matsuoka <cmatsuoka@gmail.com> * Copyright (c) 2008-2010 Claudio Matsuoka <cmatsuoka@gmail.com>
* Copyright (c) 2008-2012 Joachim Nilsson <troglobit@gmail.com> * Copyright (c) 2008-2013 Joachim Nilsson <troglobit@gmail.com>
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@@ -36,17 +36,17 @@
/* Distribution specific configuration */ /* Distribution specific configuration */
#if defined EMBEDDED_SYSTEM #if defined EMBEDDED_SYSTEM
# define CONSOLE "/dev/console" # define CONSOLE "/dev/console"
# define MDEV "/sbin/mdev" # define SETUP_DEVFS "/sbin/mdev -s"
# define GETTY "/sbin/getty -L 115200 %s vt100" # define GETTY "/sbin/getty -L 115200 %s vt100"
# define RUNLEVEL 3
#else /* Debian/Ubuntu based distributions */
# define RANDOMSEED "/var/lib/urandom/random-seed"
# define CONSOLE "/dev/tty1"
# define GETTY "/sbin/getty -8 38400 %s"
# define REMOUNT_ROOTFS_RW
# define RUNLEVEL 2 # define RUNLEVEL 2
# define USE_UDEV #else /* Debian/Ubuntu based distributions */
# define USE_MESSAGE_BUS # define CONSOLE "/dev/tty1"
# define SETUP_DEVFS "/sbin/udevd --daemon"
# define GETTY "/sbin/getty -8 38400 %s"
# define RUNLEVEL 2
# define RANDOMSEED "/var/lib/urandom/random-seed"
# define REMOUNT_ROOTFS_RW
# define HAVE_DBUS
#endif #endif
#ifndef DEFUSER #ifndef DEFUSER
plugins/dbus.c
+1 -1
View File
@@ -27,7 +27,7 @@
static void setup(void *UNUSED(arg)) static void setup(void *UNUSED(arg))
{ {
#ifdef USE_MESSAGE_BUS #ifdef HAVE_DBUS
_d("Starting D-Bus ..."); _d("Starting D-Bus ...");
mkdir("/var/run/dbus", 0755); mkdir("/var/run/dbus", 0755);
mkdir("/var/lock/subsys/messagebus", 0755); mkdir("/var/lock/subsys/messagebus", 0755);