Commit Graph
100 Commits
Author SHA1 Message Date
Joachim Nilsson b8a7f3e0cc Link to Alpine Linux home page
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-13 08:08:18 +02:00
Joachim Nilsson 7db0e265ad Link to Alpine Linux home page
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-13 08:07:06 +02:00
Joachim Nilsson 6818813ff8 plugins/dbus: Conditionalize, don't run if dbus-daemon is missing
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-13 08:02:59 +02:00
Joachim Nilsson 5b8f7ce2a3 Update screenshot, TroglOS Linux --> Alpine Linux
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-13 07:59:33 +02:00
Joachim Nilsson 1f9a6a42c1 Push badges even further down
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-13 07:37:22 +02:00
Joachim Nilsson 1c2d987bea Place logo first, then badges
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-13 07:36:06 +02:00
Joachim Nilsson 906827cc88 Move documentation to doc/ sub-directory, all except README
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-13 07:35:09 +02:00
Joachim Nilsson b2d98dc010 Update path to sample finit.conf
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 23:10:47 +02:00
Joachim Nilsson d027b4ff9c Relocate old sample finit.conf to contrib/
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 23:09:32 +02:00
Joachim Nilsson 843621aded Move documentation to doc/ sub-directory, all except README + TODO
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 23:07:21 +02:00
Joachim Nilsson da5ac16670 Minor
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 23:05:27 +02:00
Joachim Nilsson 2c68183045 Clarify actions of Alpine Linux install script
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 22:51:15 +02:00
Joachim Nilsson c40cd06d60 Update Alpine README, we now have an install script
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 22:44:56 +02:00
Joachim Nilsson c901b65581 Simplify
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 22:44:00 +02:00
Joachim Nilsson 27abcb5682 Add option to install Finit as system default init
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 22:41:20 +02:00
Joachim Nilsson b7617248ce Simple install script for Alpine Linux
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 22:35:17 +02:00
Joachim Nilsson c400d35f83 Also include /usr/lib/pkgconfig in PKG_CONFIG_LIBDIR
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 22:26:37 +02:00
Joachim Nilsson d236709457 Minor, script output updates
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 22:26:24 +02:00
Joachim Nilsson 07790f4044 Debian/REDAME: Clarify last paragraph, add reminder of /etc/rc.local
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 19:03:53 +02:00
Joachim Nilsson 3d5128be77 Remove Emacs Local Variables, not really needed and looks bad
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 19:01:25 +02:00
Joachim Nilsson b37ea48e5d Debian/README: Update, modernize, simplify, and clarify
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 18:54:34 +02:00
Joachim Nilsson 92616d2ac0 README: Add URLs for the various RFC inetd services available
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 18:46:14 +02:00
Joachim Nilsson 46bc75e7f3 README: Add more examples on conditions and multiple dependencies
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 18:43:47 +02:00
Joachim Nilsson 5f81404162 xdm.conf: Remove lightdm, now has its own .conf
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 18:25:51 +02:00
Joachim Nilsson 6ba7cfc851 Rename Debian xdm.com --> xdm.conf
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 18:24:41 +02:00
Joachim Nilsson 09d2243eba Add Debian .conf for LightDM
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 18:23:19 +02:00
Joachim Nilsson e97c5e5860 Increase log level for poweroff/reboot/halt
In case the kernel is incapable of handling a reboot,
power-off, or halt request we want to be able to let
the user perform some basic diagnose of the system.

The existing debug messages are good enough, and use
the correct grammar form, to be enabled always.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 09:03:24 +02:00
Joachim Nilsson 660a09c7c1 Reduce log level when skipping re-register of boostrap tasks
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 09:02:05 +02:00
Joachim Nilsson 41c003b221 Don't reload *.conf files when changing to runlevel reboot
... or if someone manages (regression) to change to runlevel bootstrap.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 08:56:08 +02:00
Joachim Nilsson 12d8ac2399 service_register(): Skip bootstrap services if not in bootstrap
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 08:55:42 +02:00
Joachim Nilsson 8dc263d508 Revert live logging of state machine
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 01:28:38 +02:00
Joachim Nilsson afb3fada50 cond_reassert(): Use cond_set_path(), not cond_clear(), for reconf
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 01:23:43 +02:00
Joachim Nilsson 227dda34f7 cond_set_path(): Log error if unlink() fails
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 01:23:16 +02:00
Joachim Nilsson 06479aa5f1 Remove reconf condition when .conf reload completes
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 01:07:09 +02:00
Joachim Nilsson 75d29de3cc initctl: Use entire screen width for task/service description
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-12 00:19:10 +02:00
Joachim Nilsson 40fc95047d Prevent 100% CPU, allow bootstrap tasks to fully complete
When collecting a bootstrap task we need to allow its state machine to
complete before cleaning them out.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 23:53:34 +02:00
Joachim Nilsson 5551324291 Minor, comment style
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 23:52:20 +02:00
Joachim Nilsson 46cef811d6 Make sure to step state machine when collecting bootstrap tasks
During the runlevel change from S --> 2 the state machine will pause,
waiting to collect all S-only tasks/services, before continuing.

When an S-only task/service is collected we therefore need to call the
state machine again so that it can reassert all conditions properly.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 23:02:13 +02:00
Joachim Nilsson 52ccd6d662 Use correct grammar form
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 22:54:48 +02:00
Joachim Nilsson 70afaa16f5 sm_step(): Log pending stopped svc if we exit state machine
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 22:05:33 +02:00
Joachim Nilsson 8a1015cf3e API refactor, allow svc_stop_completed() to return the pending svc
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 22:04:17 +02:00
Joachim Nilsson 586f0a7799 Live debug stopped but not yet collected tasks
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 21:56:49 +02:00
Joachim Nilsson 474bd2f361 Minor, comment style
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 21:56:31 +02:00
Joachim Nilsson 0caa8330b7 Increase live debugging of main state machine
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 21:41:42 +02:00
Joachim Nilsson c8d8c817e7 Minor, cleanup
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 21:29:21 +02:00
Joachim Nilsson 0d9542c222 Live debug
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-11 21:29:15 +02:00
Joachim Nilsson b6be354508 Minor, whitespace
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 23:39:22 +02:00
Joachim Nilsson 448c6749d6 Add missing debug calls to RTM_NEWLINK and RTM_DELLINK
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 22:53:19 +02:00
Joachim Nilsson 0f09c1b0dc Minor, comment fix
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 22:53:05 +02:00
Joachim Nilsson 7db6611593 Debian GNU/Linux: Minor caveats
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 22:15:27 +02:00
Joachim Nilsson c9b13759a2 Debian GNU/Linux: Install finit.* using install and cp
A recursive cp is requried for finit.d

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 18:50:58 +02:00
Joachim Nilsson 449c712329 Remove old symlinks and install finit.d directory instead
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 16:15:36 +02:00
Joachim Nilsson e27283c5e6 Add extra spacing
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 16:14:27 +02:00
Joachim Nilsson f337efcc35 Debian GNU/Linux: Update install script
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 16:13:22 +02:00
Joachim Nilsson 3c7eaff7b3 Debian GNU/Linux: Update and sync build instructions with Alpine
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 12:00:04 +02:00
Joachim Nilsson d4d42a7a75 Debian GNU/Linux: Convert finit.conf to finit.d/*.conf
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 11:59:29 +02:00
Joachim Nilsson 3c1c5621a5 Alpine Linux: Slight update + sync with Debian
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-10 11:46:02 +02:00
Joachim Nilsson 2d9c147e0e Minor, fix comment within comment GCC warning
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-09 09:03:58 +02:00
Joachim Nilsson 53de1c8575 Follow-up to issue #81, don't append error message again.
Also, when called multiple times, return workaround immediately instead
of warning again.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-01 22:07:21 +02:00
Joachim Nilsson 3d4e3c99ed Fix #81: Workaround for systems without SYSV shm IPC support
We should not let PID 1 fail on systems where Linux is built without
CONFIG_SYSVIPC, or the libc does not support shmget()/shmat().

This workaround implements a fallback to using calloc() for PID 1,
which means the initctl tool will not work properly.  A better fix
would be to refactor the shm implementation to instead have initctl
call Finit using api.c for each svc_t.  This has been added to the
TODO file as future work.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-01 20:52:01 +02:00
Joachim Nilsson c1b6c7e840 TODO: Remove shm, as soon as possible
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-01 20:01:57 +02:00
Joachim Nilsson f17515d791 Merge pull request #80 from joerg-krause/patch-1
helpers.h: fix build error: unknown type name ‘va_list’
2017-10-01 18:56:45 +02:00
Joachim Nilsson 9d9dc74768 Minor corrections
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-10-01 01:26:43 +02:00
Joachim Nilsson e1d1d1c795 Makefile: Remove service script wrapper from distribution as well
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-30 12:16:33 +02:00
Joachim Nilsson fcfef0af47 Initial cleanup + refactor of Debian contrib files
We should no longer need to rely on runparts to handle initial set up of
keyboard and console.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-30 10:26:03 +02:00
Joachim Nilsson c44c217c4a Clean up unused and long since deprecated contrib files/patches
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-30 10:23:21 +02:00
Joachim Nilsson d60fc1ce62 Refactor, simplify
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-29 01:22:10 +02:00
Joachim Nilsson 0a12997d32 Try right aligning Finit3 logo
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-29 01:21:07 +02:00
Joachim Nilsson dce8031c83 Clarify, early on, that conditions also stop services.
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-28 08:22:41 +02:00
Joachim Nilsson bd9d9c8303 Add early example of conditions in service stanza
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-28 08:22:28 +02:00
Joachim Nilsson 956acc4b93 Update getty overview
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-28 08:10:31 +02:00
Joachim Nilsson 5ed54d79fc Update configure flags
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-27 09:27:15 +02:00
Joachim Nilsson acc77c27c3 Add URL to initctl reference
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-27 09:23:54 +02:00
Joachim Nilsson bcb9fe039a Move running and debugging to doc/build.md
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-27 09:22:04 +02:00
Joachim Nilsson 55f44386d1 Clarify focus, refer to examples and tell what the screenshot is
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-27 09:09:23 +02:00
Joachim Nilsson 37983e69c4 Clarify service stanza and simplify text further
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-27 09:08:32 +02:00
Joachim Nilsson a45a872c28 Simplify introduction a lot, focus on screenshot and example
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-27 08:43:53 +02:00
Joachim Nilsson 152b2be8ea Clarify warning
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-27 08:43:27 +02:00
Joachim Nilsson 1677436137 initctl: Allow C99 style
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-26 10:39:45 +02:00
Joachim Nilsson c69ca6847a Update ToC and move references to alternative init systems here
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-25 19:06:07 +02:00
Joachim Nilsson f8147214f1 doc/config.md: Significant update, less limitations for /etc/finit.d
- Detail limitations in separate section
- Focus on syntax early in document
- Overhaul and simplify introduction

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-25 19:03:22 +02:00
Joachim Nilsson 56eec5164d Minor, update code comment
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-25 19:02:19 +02:00
Joachim Nilsson e58f84f3fb Update introduction, much system config can be done using finit.d
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-24 20:54:27 +02:00
Joachim Nilsson d22ffa05bd initctl: Refactor initctl list slightly
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-24 20:41:40 +02:00
Joachim Nilsson 2e66db3fea helpers.c:printv() - Iterate over size of buffer
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-24 20:40:44 +02:00
Joachim Nilsson 376811c1a7 doc/config.md: Update run and task, mention pipes + redirects
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-21 22:52:48 +02:00
Joachim Nilsson 9b5f2388c1 Alpine Linux: Add LXDM service .conf
Enable LXDM using:

    initctl enable lxdm
    initctl reload

The latter command reloads all /etc/finit.d/*.conf files and starts lxdm
in runlevels 2-5.

Remember to first edit /etc/lxdm/lxdm.conf, necessary to get a session.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 15:33:56 +02:00
Joachim Nilsson 686193b701 Only load modules at bootstrap
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 14:03:56 +02:00
Joachim Nilsson b43bca529c Minor, fix build error
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 13:57:23 +02:00
Joachim Nilsson 545171a8b2 Minor, improve comments in parse_dynamic()
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 13:50:44 +02:00
Joachim Nilsson d54d5b7f20 Allow kernel modules to be loaded from /etc/finit.d/*.conf
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 13:48:07 +02:00
Joachim Nilsson e52d952ca5 Alpine: Move bootstrap services and setup from finit.conf to finit.d/*.conf
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 13:30:36 +02:00
Joachim Nilsson 633a56054b Add support for boot[S]trap services in /etc/finit.d/*.conf
This patch enables support for bootstrap services in /etc/finit.d/

Please note, however, that this does not mean that all configuration
directives are now allowed in /etc/finit.d/*.conf -- the intention is
only to simplify distribution setups.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 13:21:11 +02:00
Joachim Nilsson 3eeb966f15 Alpine Linux: Simplify build instructions by referencing script
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 12:55:32 +02:00
Joachim Nilsson d09253bdbd Make Alpine build script executable
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 12:50:36 +02:00
Joachim Nilsson 0052793a46 Update Alpine Linux README
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 11:41:05 +02:00
Joachim Nilsson 333871caf2 Minor, reorder
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 11:40:56 +02:00
Joachim Nilsson ef9d0c479e Load mousedev kernel driver for Alpine installs
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 01:40:24 +02:00
Joachim Nilsson d5cce03a76 Enable D-Bus plugin for Alpine installs
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-10 01:39:23 +02:00
Joachim Nilsson 744903d455 Alpine Linux finit.conf, clear space at end for easy script append
Restore original file layout somewhat, it's better if we clear the space
at the end of the file for easy `cat BOOTSTRAP.conf >>/etc/finit.conf`

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
2017-09-06 08:12:44 +02:00