Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f09ae94000 | ||
|
|
2e22b32f60 | ||
|
|
c283fb6b67 | ||
|
|
cf5ccbc759 | ||
|
|
90ee9cd49d | ||
|
|
a7f92e3219 | ||
|
|
8ae9a9b856 | ||
|
|
c4ebd431c9 | ||
|
|
7e885f37bb |
423
ChangeLog
423
ChangeLog
@@ -1,292 +1,4 @@
|
||||
commit 0e3f8720984d7d5752a78a4135cd268e4f83b3d7
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init: send term/kill signals as final step of shutdown
|
||||
|
||||
commit 5fd3747b190887d094225547f23007d25e2d9592
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
reword the bugs section of the openrc-init man page
|
||||
|
||||
commit 4694900190a9078397bb9083328b68b489af92f4
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init: fix signal handling
|
||||
|
||||
The only signals we handle are SIGINT and SIGCHLD, so block all others
|
||||
and unblock them in the child process before we start a rurnlevel.
|
||||
|
||||
commit 05738bfce120114037d4f02c67ec740813f94b89
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init: add re-exec capability
|
||||
|
||||
This will allow the re-execution of the init process after upgrading
|
||||
OpenRC.
|
||||
|
||||
commit 6f88ee4ec6f59e545346a7422facc3e5b6adac04
|
||||
Author: i.Dark_Templar <darktemplar@dark-templar-archives.net>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
bootmisc: do not remove ld-elf32.so.hints
|
||||
|
||||
File /var/run/ld-elf32.so.hints is used on FreeBSD 64bit multilib
|
||||
This fixes #125.
|
||||
|
||||
commit cc51bdca3bac963878141da047e92f125772e14f
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Add attribution to openrc-init.c and openrc-shutdown.c
|
||||
|
||||
commit 13ca79856e5836117e469c3edbcfd4bf47b6bab0
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
add init process
|
||||
|
||||
openrc-init.c and openrc-shutdown.c are based on code which was written by
|
||||
James Hammons <jlhamm@acm.org>, so I would like to publically
|
||||
thank him for his work.
|
||||
|
||||
commit 79a9edc73068244ad843f2edbe4206ce696c91c8
|
||||
Author: i.Dark_Templar <darktemplar@dark-templar-archives.net>
|
||||
Commit: i.Dark_Templar <darktemplar@dark-templar-archives.net>
|
||||
|
||||
Fix make install on FreeBSD: don't try to install /etc/init.d/modules twice
|
||||
|
||||
commit 9eb669591e16c5ee0ca07babe058d0b7b2396077
|
||||
Author: Austin English <austinenglish@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
start-stop-daemon: warn if calling --start with --retry or --stop with --wait
|
||||
|
||||
This fixes #122
|
||||
|
||||
commit 55a87a30ec845eb725e8a923c8f8eb7aa75baa72
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d/agetty.in: add -prefix keyword
|
||||
|
||||
commit a912029462ae988ab4e2a96a0958e54a3c2e822f
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d/mount-ro: change dependency on killprocs and savecache to after
|
||||
|
||||
killprocs always succeeds and savecache is not required by mount-ro, so
|
||||
we can just start after both of these have run.
|
||||
|
||||
commit 1e9078279709df2a3617bf1460890ceb1ddfcf59
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
agetty-guide: typo fix
|
||||
|
||||
commit 51a292e09b9362f13d5747d4eedaa521ddf9ce72
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d: add agetty to ignore patterns
|
||||
|
||||
commit 50fccf47d4bd2ed6e7ea6ff7f72577c8e7b95d0d
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
sh/gendepends.sh.in: fix detection of service scripts
|
||||
|
||||
We do not need to care about the path on the shebang line of a service
|
||||
script as long as the shebang line ends with "openrc-run".
|
||||
This fixes #119 and #120.
|
||||
|
||||
commit 9bd63b5d4a16601712a65eb8962214cdd4d26ce5
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
update dependencies for clock service
|
||||
|
||||
The clock services had a very long list of "before" dependencies that
|
||||
referred to other services within OpenRC. For ease of maintenance,
|
||||
convert these to "after clock" dependencies in the individual services.
|
||||
|
||||
commit 48db17a93f5e60c0d241f8fb06bfbdd01206fb9c
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
update news file
|
||||
|
||||
commit c333707cba356f4cacfd58a6fcc78f7c073dddcd
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Remove all occurances of 'before *' from dependencies
|
||||
|
||||
Using wildcards in dependencies causes issues when rc_parallel is set to
|
||||
yes because it can lead to deadlocks.
|
||||
All dependencies need to be explicit rather than implicit.
|
||||
|
||||
This is the first stage of moving this direction.
|
||||
|
||||
commit 5f5b1f7cbefd0bc14352e86a9c33260266f98d9b
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d/sysfs.in: efivarfs tweaks
|
||||
|
||||
Since we check for /sys/firmware/efi/efivars, we do not need to check
|
||||
for /sys/firmware/efi
|
||||
|
||||
Since Failing to mount efivarfs is not critical, we silence the error
|
||||
message from mount.
|
||||
|
||||
commit cfdf56475e600f79a433cd721cadf39114c6c58d
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
version 0.25
|
||||
|
||||
commit fde3902d069dfdce9c59555186a5541d6d99c8aa
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
update ChangeLog
|
||||
|
||||
commit d7bbb0f5830e1ec4df1ec52714d70ac6b0a81878
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
add agetty service
|
||||
|
||||
The agetty service is an alternate way to manage gettys with agetty
|
||||
under Linux which is separate from an external init system.
|
||||
|
||||
commit 21ca2b746cce67e2b3578fb7015c9d4c243e3a0c
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d/sysfs: drop modules completely from the dependencies
|
||||
|
||||
This is for #112.
|
||||
|
||||
commit 6a79aef0159d7035778fd852b26ecfac903cd029
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d/sysfs: Do not load efivarfs module
|
||||
|
||||
My understanding is that the kernel can autoload this module. If it
|
||||
doesn't, the module should be built in or loaded from an initramfs.
|
||||
|
||||
This fixes https://github.com/openrc/openrc/pulls/112.
|
||||
|
||||
commit 4a269674b765e5267f024fa55c8644480a7304ea
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
make sure netmount and localmount start after root
|
||||
|
||||
commit eea4decdd1c84e4b8775a255d8ed85bce5eb40a5
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
net-online: typo fix
|
||||
|
||||
commit d4d0f25a4844ecaed43de913e8b729e7a2e894db
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
net-online: updates to make the service more usable
|
||||
|
||||
- switch from attempting to ping the default gateway to a host outside
|
||||
the local network, defaulting to google.com.
|
||||
- along with this, change the name of the variable that requests a ping
|
||||
test to include_ping_test so the meaning is more clear.
|
||||
|
||||
commit 1cb44092fce298004ab4c4547c6fbcac29c5997f
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
sh/rc-functions.sh.in: add get_bootparam_value function
|
||||
|
||||
commit 4207e46622f584eb5f0cc10bbfd36f92f001a2e2
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
move init.d examples under support and install them
|
||||
|
||||
commit f6ea16159ec8583a6f2182578334aa00578cb080
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
scripts: make sure the rc-sstat symlink is always replaced
|
||||
|
||||
commit 9047ea4cb0d0e5e27704369380e128d26c3e86b2
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
install support files
|
||||
|
||||
These files have been in the distribution for some time but haven't been
|
||||
installed. They are good examples of how to do things, so we should
|
||||
install them.
|
||||
|
||||
commit d7f5a696c173e7af67dd4b3f90744e0a056441e1
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
support: rename all README files to README.md
|
||||
|
||||
commit 6f614cd3f33dbdea3a67ac2fb414b1130674ee04
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Move deptree2dot to the support folder
|
||||
|
||||
Since deptree2dot and the perl requirement are completely optional, we
|
||||
can move this tool to the support folder. This gives the user the option
|
||||
of using it if they have perl installed, and means we do not have an
|
||||
optional runtime dependency on perl.
|
||||
|
||||
Documentation for this tool has also been added to the support folder.
|
||||
|
||||
X-Gentoo-Bug: 600742
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600742
|
||||
|
||||
commit 85c1930acf15b0c9d3c5537fb2b0409c6a11c982
|
||||
Author: William Pitcock <nenolod@dereferenced.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
test/setup_env: ensure that eval_ecolors is available on the path.
|
||||
|
||||
The test environment previously used the system default paths instead of installing the necessary $PATH environment
|
||||
variable to make finding eval_ecolors work.
|
||||
This closes #117.
|
||||
|
||||
X-Gentoo-Bug: 374191.
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=374191.
|
||||
|
||||
commit 96bd0c004c9549e5a2ef64277216a15da6f96a8e
|
||||
Author: Nicolas Porcel <nicolasporcel06@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Fix typo in guide.md
|
||||
|
||||
This fixes #115.
|
||||
|
||||
commit b693af90556ac9b055ba5c6e589066c1e08b2146
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Revert "scripts: do not substitute for @SHELL@ in rc-sstat"
|
||||
|
||||
This reverts commit e2e652e469efa5f3ebcd69828ff16d8f5ad3f1b8.
|
||||
|
||||
commit 6dcb6929869c2f81c1f8d0930191f74fc6dfaa3e
|
||||
commit 2e22b32f600676495e5d5a6ccbf7b307c0588b1a
|
||||
Author: Doug Freed <dwfreed@mtu.edu>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
@@ -298,13 +10,19 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
X-Gentoo-Bug: 604986
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604986
|
||||
|
||||
commit e2e652e469efa5f3ebcd69828ff16d8f5ad3f1b8
|
||||
commit c283fb6b67efc83b9567e63aae5ef12cd8a463f4
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
scripts: do not substitute for @SHELL@ in rc-sstat
|
||||
version 0.23.2
|
||||
|
||||
commit b73941f0c3020e3dbd1684d09685e114c678b520
|
||||
commit cf5ccbc7599c0fed7e189c5f73cb632d5ab929c6
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
update ChangeLog
|
||||
|
||||
commit 90ee9cd49df773b2aef2acb2ca72ac92c3e62835
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
@@ -318,7 +36,7 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
X-Gentoo-Bug: 604646
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604646
|
||||
|
||||
commit c304522131a795cf882444b5f94e81db4baf65b3
|
||||
commit a7f92e3219d0a5278fe8bd742e2e5cb68048210e
|
||||
Author: Benda Xu <heroxbd@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
@@ -327,7 +45,7 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
X-Gentoo-Bug: 604666
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
|
||||
|
||||
commit 92325b44ba58a7ca04d88ae8ca202b402b032b43
|
||||
commit 8ae9a9b85614d6c3b246805c3be9e01d49f0b986
|
||||
Author: Benda Xu <heroxbd@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
@@ -336,35 +54,17 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
X-Gentoo-Bug: 604666
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
|
||||
|
||||
commit 074d90f5a4e3b66e532a0becde372acf38346397
|
||||
Author: Benda Xu <heroxbd@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Drop the use of the _BSD_SOURCE macro on Linux
|
||||
|
||||
X-Gentoo-Bug: 604666
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
|
||||
|
||||
commit 7056b56b3ccc9cbde4ef8297b923919c49c7c242
|
||||
Author: Benda Xu <heroxbd@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Drop the use of the _BSD_SOURCE macro on GNU/Hurd
|
||||
|
||||
X-Gentoo-Bug: 604666
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666
|
||||
|
||||
commit d5c3b85e3fbddbba149687244d607fcdae222f95
|
||||
commit c4ebd431c9997e21c82ba020f36c549d1e1bb53c
|
||||
Author: Doug Freed <dwfreed@mtu.edu>
|
||||
Commit: Doug Freed <dwfreed@mtu.edu>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
loopback: drop explicit route for BSD too
|
||||
|
||||
commit 1ab2249448ba24a591b561f53aa64ff3df1e41f6
|
||||
commit 7e885f37bbe40e098bb84562348a776b60cf17a3
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
version 0.24
|
||||
version 0.23.1
|
||||
|
||||
commit a15cff21c63f2ad951af1c59a74fc7d37f78e91b
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
@@ -1414,3 +1114,94 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Now both localmount and netmount support a critical_mounts setting. If
|
||||
mount points listed in this setting fail to mount, localmount and
|
||||
netmount will fail.
|
||||
|
||||
commit 1c3c2cf6d8cb060d03919297f5fe706f6027a4c6
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
netmount: fix mounting on Linux
|
||||
|
||||
Before this commit, on Linux, we were always trying to mount file
|
||||
systems marked with _netdev, even when the previous mount command
|
||||
failed. Now, we do not run the second mount if the first fails.
|
||||
|
||||
X-Gentoo-Bug: 579876
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=579876
|
||||
|
||||
commit 171e856ec8a0a64504b4b4a47ab6181d37fc3dbe
|
||||
Author: Mike Gilbert <floppym@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
start-stop-daemon: Allow group read/write when creating output files
|
||||
|
||||
This allows for better interaction with inherited ACL entries.
|
||||
This fixes #84.
|
||||
|
||||
X-Gentoo-Bug: 577362
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/577362
|
||||
|
||||
commit beaa71df0ab2cfa61beba4be0303099aa6c75e6a
|
||||
Author: Dustin C. Hatch <dustin@hatch.name>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
binfmt.sh: use read in raw mode
|
||||
|
||||
The read builtin in most shells will interpret backslash characters
|
||||
as escapes, and they are lost when reading binfmt files line-by-line.
|
||||
This causes magic strings containing backslashes to be mangled and
|
||||
become invalid, resulting in erroneous 'invalid entry' messages.
|
||||
|
||||
The -r option to read disables special handling of backslashes and
|
||||
keeps all lines intact.
|
||||
|
||||
X-Gentoo-Bug: 575114
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=575114
|
||||
|
||||
commit 7eaf71176b87ae69bfa622aa621341a19a9d32b0
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Fix rc_env_allow wildcard usage
|
||||
|
||||
Before this commit, using * in rc_env_allow did not work.
|
||||
|
||||
This fixes #60.
|
||||
|
||||
commit 2c1f6a16e10a45397e0872585dcb0e16684b6cbf
|
||||
Author: Mike Frysinger <vapier@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
sysfs: mount pstore when available
|
||||
|
||||
commit e82653782e1803e3c924aef055113333b18dafd9
|
||||
Author: Patrick Lauer <patrick@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Add a basic OpenRC users guide
|
||||
|
||||
X-Gentoo-Bug: 513024
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=513024
|
||||
|
||||
commit e52b5f59c22283b22e2b5a0d2ab9de6b92a73ebf
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
savecache: stop saving nettree
|
||||
|
||||
Netifrc is no longer part of OpenRC, so we shouldn't save its dep tree
|
||||
as part of savecache.
|
||||
|
||||
This should have been removed when netifrc was split out. also, it
|
||||
might be related to the following bug.
|
||||
|
||||
X-Gentoo-Bug: 563720
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=563720
|
||||
|
||||
commit 8a7e4d38a74c714e1a532e1b7a53fd2a5c528b63
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
rc-service: add --ifinactive and --ifnotstarted flags
|
||||
|
||||
X-Gentoo-Bug: 523174
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=523174
|
||||
|
||||
2
Makefile
2
Makefile
@@ -13,7 +13,7 @@ MK= ${TOP}/mk
|
||||
|
||||
include ${TOP}/Makefile.inc
|
||||
|
||||
SUBDIR= conf.d etc init.d local.d man scripts sh src support sysctl.d
|
||||
SUBDIR= conf.d etc init.d local.d man scripts sh src sysctl.d
|
||||
|
||||
# Build pkgconfig or not
|
||||
MKPKGCONFIG?= yes
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
NAME= openrc
|
||||
VERSION= 0.25
|
||||
VERSION= 0.23.2
|
||||
PKG= ${NAME}-${VERSION}
|
||||
|
||||
29
NEWS.md
29
NEWS.md
@@ -3,35 +3,6 @@
|
||||
This file will contain a list of notable changes for each release. Note
|
||||
the information in this file is in reverse order.
|
||||
|
||||
## OpenRC-0.25
|
||||
|
||||
This version contains an OpenRC-specific implementation of init for
|
||||
Linux which can be used in place of sysvinit or any other init process.
|
||||
For information on its usage, see the man pages for openrc-init (8) and
|
||||
openrc-shutdown (8).
|
||||
|
||||
## OpenRC-0.24.1
|
||||
|
||||
This version starts cleaning up the dependencies so that rc_parallel
|
||||
will work correctly.
|
||||
|
||||
The first step in this process is to remove the 'before *' from the
|
||||
depend functions in the clock services. This means some services not
|
||||
controlled by OpenRC may now start before instead of after the clock
|
||||
service. If it is important for these services to start after the clock
|
||||
service, they need to have 'after clock' added to their depend
|
||||
functions.
|
||||
|
||||
## OpenRC-0.24
|
||||
|
||||
Since the deptree2dot tool and the perl requirement are completely
|
||||
optional, the deptree2dot tool has been moved to the support directory.
|
||||
As a result, the MKTOOLS=yes/no switch has been removed from the makefiles.
|
||||
|
||||
This version adds the agetty service which can be used to spawn
|
||||
agetty on a specific terminal. This is currently documented in the
|
||||
agetty-guide.md file at the top level of this distribution.
|
||||
|
||||
## OpenRC-0.23
|
||||
|
||||
The tmpfiles.d processing code, which was part of previous versions of
|
||||
|
||||
@@ -30,6 +30,7 @@ MKSELINUX=yes
|
||||
MKSTATICLIBS=no
|
||||
MKTERMCAP=ncurses
|
||||
MKTERMCAP=termcap
|
||||
MKTOOLS=yes
|
||||
PKG_PREFIX=/usr/pkg
|
||||
LOCAL_PREFIX=/usr/local
|
||||
PREFIX=/usr/local
|
||||
@@ -72,6 +73,10 @@ Obviously, if you're installing this onto a system that does not use
|
||||
OpenRC by default then you may wish to backup the above listed files,
|
||||
remove them and then install so that the OS hooks into OpenRC.
|
||||
|
||||
`init.d.misc` is not installed by default as the scripts will need
|
||||
tweaking on a per distro basis. They are also non essential to the
|
||||
operation of the system.
|
||||
|
||||
## Reporting Bugs
|
||||
|
||||
If you are using Gentoo Linux, bugs can be filed on their bugzilla under
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
# Setting up the agetty service in OpenRC
|
||||
|
||||
The agetty service is an OpenRC specific way to monitor and respawn a
|
||||
getty, using agetty, on Linux. To use this method, make sure you aren't
|
||||
spawning a getty manager for this port some other way (such as through
|
||||
sysvinit/inittab), then run the following commands as root.
|
||||
|
||||
Note that [port] refers to the port you are spawning the getty on, for
|
||||
example, tty1 or ttyS0. The full path to it, for example, /dev/tty1
|
||||
should not be used.
|
||||
|
||||
```
|
||||
# cd /etc/init.d
|
||||
# ln -s agetty agetty.[port]
|
||||
# cd /etc/conf.d
|
||||
# cp agetty agetty.[port]
|
||||
#rc-update add agetty.[port] [runlevel]
|
||||
```
|
||||
@@ -12,8 +12,8 @@ include ${MK}/os.mk
|
||||
|
||||
CONF-FreeBSD= ipfw modules moused powerd rarpd savecore syscons
|
||||
|
||||
CONF-Linux= agetty consolefont devfs dmesg hwclock keymaps killprocs modules \
|
||||
mtab net-online
|
||||
CONF-Linux= consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
|
||||
net-online
|
||||
|
||||
CONF-NetBSD= moused rarpd savecore
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
# Set the baud rate of the terminal line
|
||||
#baud=""
|
||||
|
||||
# set the terminal type
|
||||
#termtype="linux"
|
||||
|
||||
# extra options to pass to agetty for this port
|
||||
#agetty_options=""
|
||||
@@ -3,13 +3,10 @@
|
||||
# default is all interfaces that support ethernet.
|
||||
#interfaces=""
|
||||
|
||||
# This setting controls whether a ping test is included in the test for
|
||||
# network connectivity after all interfaces are active.
|
||||
#include_ping_test=no
|
||||
|
||||
# This setting is the host to attempt to ping if the above is yes.
|
||||
# The default is google.com.
|
||||
#ping_test_host=some.host.name
|
||||
# This setting controls whether a ping to the default gateway is
|
||||
# included in the test for network connectivity after all interfaces
|
||||
# are active.
|
||||
#ping_default_gateway=no
|
||||
|
||||
# The timeout setting controls how long the net-online service waits
|
||||
# for the network to be configured.
|
||||
|
||||
@@ -178,11 +178,6 @@
|
||||
# "xenU" - XenU Domain (Linux and NetBSD)
|
||||
#rc_sys=""
|
||||
|
||||
# if you use openrc-init, which is currently only available on Linux,
|
||||
# this is the default runlevel to activate after "sysinit" and "boot"
|
||||
# when booting.
|
||||
#rc_default_runlevel="default"
|
||||
|
||||
# on Linux and Hurd, this is the number of ttys allocated for logins
|
||||
# It is used in the consolefont, keymaps, numlock and termencoding
|
||||
# service scripts.
|
||||
|
||||
2
guide.md
2
guide.md
@@ -198,7 +198,7 @@ script:
|
||||
command=
|
||||
command_args=
|
||||
pidfile=
|
||||
```
|
||||
``
|
||||
|
||||
Thus the 'smallest' service scripts can be half a dozen lines long
|
||||
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
DIR= ${DATADIR}/support/init.d.examples
|
||||
INC= README.md
|
||||
DIR= ${INITDIR}
|
||||
SRCS= avahi-dnsconfd.in avahid.in dhcpcd.in dbus.in \
|
||||
hald.in named.in ntpd.in \
|
||||
openvpn.in polkitd.in sshd.in wpa_supplicant.in
|
||||
BIN= ${OBJS}
|
||||
|
||||
MK= ../../mk
|
||||
MK= ../mk
|
||||
|
||||
SED_EXTRA+= -e 's:@VARBASE@:/var:g'
|
||||
|
||||
1
init.d/.gitignore
vendored
1
init.d/.gitignore
vendored
@@ -1,4 +1,3 @@
|
||||
agetty
|
||||
binfmt
|
||||
modules-load
|
||||
bootmisc
|
||||
|
||||
@@ -19,11 +19,11 @@ SRCS-FreeBSD= hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
|
||||
rc-enabled.in rpcbind.in savecore.in syslogd.in
|
||||
# These are FreeBSD specific
|
||||
SRCS-FreeBSD+= adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
|
||||
modules-load.in mixer.in nscd.in powerd.in syscons.in
|
||||
modules.in modules-load.in mixer.in nscd.in powerd.in syscons.in
|
||||
|
||||
SRCS-Linux= agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
|
||||
keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.in \
|
||||
numlock.in procfs.in net-online.in sysfs.in termencoding.in
|
||||
SRCS-Linux= binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
|
||||
killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
|
||||
procfs.in net-online.in sysfs.in termencoding.in
|
||||
|
||||
# Generic BSD scripts
|
||||
SRCS-NetBSD= hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
|
||||
|
||||
@@ -23,7 +23,6 @@ fi
|
||||
|
||||
depend()
|
||||
{
|
||||
after swclock
|
||||
provide clock
|
||||
# BSD adjkerntz needs to be able to write to /etc
|
||||
if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] ||
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
#!@SBINDIR@/openrc-run
|
||||
# Copyright (c) 2017 The OpenRC Authors.
|
||||
# See the Authors file at the top-level directory of this distribution and
|
||||
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
|
||||
#
|
||||
# This file is part of OpenRC. It is subject to the license terms in
|
||||
# the LICENSE file found in the top-level directory of this
|
||||
# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
|
||||
# This file may not be copied, modified, propagated, or distributed
|
||||
# except according to the terms contained in the LICENSE file.
|
||||
|
||||
description="start agetty on a terminal line"
|
||||
supervisor=supervise-daemon
|
||||
port="${RC_SVCNAME#*.}"
|
||||
term_type="${term_type:-linux}"
|
||||
command=/sbin/agetty
|
||||
command_args_foreground="${agetty_options} ${port} ${baud} ${termtype}"
|
||||
pidfile="/run/${RC_SVCNAME}.pid"
|
||||
|
||||
depend() {
|
||||
after local
|
||||
keyword -prefix
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
if [ -z "$port" ]; then
|
||||
eerror "${RC_SVCNAME} cannot be started directly. You must create"
|
||||
eerror "symbolic links to it for the ports you want to start"
|
||||
eerror "agetty on and add those to the appropriate runlevels."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
@@ -13,7 +13,7 @@ description="Register misc binary format handlers"
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock procfs
|
||||
after procfs
|
||||
use modules devfs
|
||||
keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
@@ -71,8 +71,7 @@ cleanup_var_run_dir()
|
||||
ebegin "Cleaning /var/run"
|
||||
for x in $(find /var/run ! -type d ! -name utmp \
|
||||
! -name random-seed ! -name dev.db \
|
||||
! -name ld-elf.so.hints ! -name ld-elf32.so.hints \
|
||||
! -name ld.so.hints);
|
||||
! -name ld-elf.so.hints ! -name ld.so.hints);
|
||||
do
|
||||
# Clean stale sockets
|
||||
if [ -S "$x" ]; then
|
||||
|
||||
@@ -13,7 +13,6 @@ description="Creates the dev database"
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
need localmount
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
description="Configures a specific kernel dump device."
|
||||
|
||||
depend() {
|
||||
after clock
|
||||
need swap
|
||||
keyword -jail -prefix
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ _IFS="
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
use dev clock modules
|
||||
keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ extra_commands="reset"
|
||||
depend()
|
||||
{
|
||||
use root
|
||||
after clock
|
||||
before devd net
|
||||
keyword -jail -prefix
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
description="Sets the hostname of the machine."
|
||||
|
||||
depend() {
|
||||
after clock
|
||||
keyword -docker -lxc -prefix -systemd-nspawn
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,8 @@ depend()
|
||||
want modules
|
||||
if yesno $clock_adjfile; then
|
||||
use root
|
||||
else
|
||||
before *
|
||||
fi
|
||||
keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ description="Applies a keymap for the consoles."
|
||||
depend()
|
||||
{
|
||||
need localmount termencoding
|
||||
after bootmisc clock
|
||||
after bootmisc
|
||||
keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab."
|
||||
depend()
|
||||
{
|
||||
need fsck
|
||||
use lvm modules mtab root
|
||||
after clock lvm modules root
|
||||
use lvm modules mtab
|
||||
after lvm modules
|
||||
keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ description="Configures the loopback interface."
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
keyword -jail -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ description="Re-mount filesytems read-only for a clean reboot."
|
||||
|
||||
depend()
|
||||
{
|
||||
after killprocs savecache
|
||||
need killprocs savecache
|
||||
keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ description="Update /etc/mtab to match what the kernel knows about"
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
need root
|
||||
keyword -prefix -systemd-nspawn
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ depend()
|
||||
{
|
||||
after modules
|
||||
need sysfs
|
||||
provide network-online
|
||||
keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
|
||||
}
|
||||
|
||||
@@ -28,6 +27,19 @@ get_interfaces()
|
||||
done
|
||||
}
|
||||
|
||||
get_default_gateway()
|
||||
{
|
||||
local cmd gateway
|
||||
if command -v ip > /dev/null 2>&1; then
|
||||
cmd="ip route show"
|
||||
else
|
||||
cmd=route
|
||||
fi
|
||||
set -- $($cmd | grep default)
|
||||
[ "$2" != via ] && gateway="$2" || gateway="$3"
|
||||
printf "%s" $gateway
|
||||
}
|
||||
|
||||
start ()
|
||||
{
|
||||
local carriers configured dev gateway ifcount infinite
|
||||
@@ -54,15 +66,10 @@ start ()
|
||||
: $((timeout -= 1))
|
||||
done
|
||||
! $infinite && [ $timeout -eq 0 ] && rc=1
|
||||
include_ping_test=${include_ping_test:-${ping_default_gateway}}
|
||||
if [ -n "${ping_default_gateway}" ]; then
|
||||
ewarn "ping_default_gateway is deprecated, please use include_ping_test"
|
||||
fi
|
||||
if [ $rc -eq 0 ] && yesno ${include_ping_test:-no}; then
|
||||
ping_test_host="${ping_test_host:-google.com}"
|
||||
if [ -n "$ping_test_host" ]; then
|
||||
ping -c 1 $ping_test_host > /dev/null 2>&1
|
||||
rc=$?
|
||||
if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
|
||||
gateway="$(get_default_gateway)"
|
||||
if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
|
||||
rc=1
|
||||
fi
|
||||
fi
|
||||
eend $rc "The network is offline"
|
||||
|
||||
@@ -20,12 +20,10 @@ depend()
|
||||
*) mywant="$mywant nfsclient"; break ;;
|
||||
esac
|
||||
done
|
||||
after root
|
||||
config /etc/fstab
|
||||
want $mywant
|
||||
use afc-client amd openvpn
|
||||
use dns
|
||||
use root
|
||||
keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ __nl="
|
||||
depend()
|
||||
{
|
||||
need localmount
|
||||
after bootmisc clock
|
||||
after bootmisc
|
||||
if [ -n "$(interfaces)" ]; then
|
||||
provide net
|
||||
fi
|
||||
|
||||
@@ -13,7 +13,6 @@ required_files="/etc/newsyslog.conf"
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
need localmount
|
||||
keyword -prefix
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ description="Mounts misc filesystems in /proc."
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
use devfs
|
||||
want modules
|
||||
need localmount
|
||||
|
||||
@@ -13,7 +13,6 @@ description="Mount the root fs read/write"
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
need fsck
|
||||
keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ description="Saves a kernel dump."
|
||||
depend()
|
||||
{
|
||||
need dumpon localmount
|
||||
after clock
|
||||
before encswap
|
||||
keyword -jail -prefix
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
S#!@BINDIR@/openrc-run
|
||||
#!@SBINDIR@/openrc-run
|
||||
# Copyright (c) 2009-2015 The OpenRC Authors.
|
||||
# See the Authors file at the top-level directory of this distribution and
|
||||
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
|
||||
@@ -14,9 +14,9 @@ S#!@BINDIR@/openrc-run
|
||||
description="Configures static routes."
|
||||
__nl="
|
||||
"
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
provide net
|
||||
use network
|
||||
keyword -jail -prefix -vserver
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
before fsck
|
||||
keyword -jail -prefix
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
before localmount
|
||||
keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ description="Sets the local clock to the mtime of a given file."
|
||||
|
||||
depend()
|
||||
{
|
||||
before *
|
||||
provide clock
|
||||
keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
# except according to the terms contained in the LICENSE file.
|
||||
|
||||
depend() {
|
||||
after clock
|
||||
need localmount
|
||||
keyword -jail -prefix
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
before bootmisc logger
|
||||
keyword -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
|
||||
|
||||
depend()
|
||||
{
|
||||
want modules
|
||||
keyword -docker -lxc -prefix -systemd-nspawn -vserver
|
||||
}
|
||||
|
||||
@@ -98,12 +99,23 @@ mount_misc()
|
||||
fi
|
||||
|
||||
# set up kernel support for efivarfs
|
||||
if [ -d /sys/firmware/efi/efivars ] &&
|
||||
! mountinfo -q /sys/firmware/efi/efivars; then
|
||||
ebegin "Mounting efivarfs filesystem"
|
||||
mount -n -t efivarfs -o ${sysfs_opts} \
|
||||
efivarfs /sys/firmware/efi/efivars 2> /dev/null
|
||||
eend 0
|
||||
# The presence of /sys/firmware/efi indicates that the system was
|
||||
# booted in efi mode.
|
||||
if [ -d /sys/firmware/efi ]; then
|
||||
if [ ! -d /sys/firmware/efi/efivars ] &&
|
||||
modprobe -q efivarfs; then
|
||||
ewarn "The efivarfs module needs to be configured in " \
|
||||
"@SYSCONFDIR@/conf.d/modules or built in"
|
||||
fi
|
||||
if [ -d /sys/firmware/efi/efivars ] &&
|
||||
! mountinfo -q /sys/firmware/efi/efivars; then
|
||||
if grep -qs efivarfs /proc/filesystems; then
|
||||
ebegin "Mounting efivarfs filesystem"
|
||||
mount -n -t efivarfs -o ${sysfs_opts} \
|
||||
efivarfs /sys/firmware/efi/efivars
|
||||
eend $?
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -22,6 +22,6 @@ depend()
|
||||
provide logger
|
||||
use net newsyslog
|
||||
need localmount
|
||||
after bootmisc clock
|
||||
after bootmisc
|
||||
keyword -prefix
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ depend()
|
||||
{
|
||||
keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
|
||||
use root
|
||||
after bootmisc clock
|
||||
after bootmisc
|
||||
}
|
||||
|
||||
start()
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock fsck
|
||||
after fsck
|
||||
keyword -prefix
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ description="Initializes the random number generator."
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
need localmount
|
||||
keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
depend()
|
||||
{
|
||||
after clock
|
||||
need localmount
|
||||
keyword -prefix
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ MAN8= rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
|
||||
service.8 start-stop-daemon.8 supervise-daemon.8
|
||||
|
||||
ifeq (${OS},Linux)
|
||||
MAN8 += rc-sstat.8 openrc-init.8 openrc-shutdown.8
|
||||
MAN8 += rc-sstat.8
|
||||
endif
|
||||
|
||||
# Handy macro to create symlinks
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
.\" Copyright (c) 2017 The OpenRC Authors.
|
||||
.\" See the Authors file at the top-level directory of this distribution and
|
||||
.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
|
||||
.\"
|
||||
.\" This file is part of OpenRC. It is subject to the license terms in
|
||||
.\" the LICENSE file found in the top-level directory of this
|
||||
.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
|
||||
.\" This file may not be copied, modified, propagated, or distributed
|
||||
.\" except according to the terms contained in the LICENSE file.
|
||||
.\"
|
||||
.Dd April 6, 2017
|
||||
.Dt openrc-init 8 SMM
|
||||
.Os OpenRC
|
||||
.Sh NAME
|
||||
.Nm openrc-init
|
||||
.Nd the parent of all processes
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Sh DESCRIPTION
|
||||
.Nm
|
||||
is an init process which can be an alternative to sysvinit or any other
|
||||
init process.
|
||||
.Pp
|
||||
To use
|
||||
.Nm
|
||||
configure your boot loader to invoke it or symlink it to /sbin/init.
|
||||
Also, you will need to use
|
||||
.Xr openrc-shutdown 8 ,
|
||||
to halt, reboot or poweroff the system.
|
||||
.Pp
|
||||
The default runlevel is read from the init command line, the
|
||||
rc_default_runlevel setting in rc.conf, the kernel command line, or it is
|
||||
assumed to be "default" if it is not set in any of these places.
|
||||
.Pp
|
||||
.Nm
|
||||
doesn't manage getty's directly, so you will need to manage them another
|
||||
way. For example, you can use the agetty service script as described in
|
||||
agetty-guide.md in this distribution.
|
||||
.Sh BUGS
|
||||
This was first released as part of OpenRC 0.25.
|
||||
I do not know of any specific issues. However, since this is the first
|
||||
release of openrc-init, please test and report any issues you find.
|
||||
.Sh SEE ALSO
|
||||
.Xr openrc-shutdown 8 ,
|
||||
.Sh AUTHORS
|
||||
.An William Hubbs <w.d.hubbs@gmail.com>
|
||||
@@ -1,47 +0,0 @@
|
||||
.\" Copyright (c) 2017 The OpenRC Authors.
|
||||
.\" See the Authors file at the top-level directory of this distribution and
|
||||
.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
|
||||
.\"
|
||||
.\" This file is part of OpenRC. It is subject to the license terms in
|
||||
.\" the LICENSE file found in the top-level directory of this
|
||||
.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
|
||||
.\" This file may not be copied, modified, propagated, or distributed
|
||||
.\" except according to the terms contained in the LICENSE file.
|
||||
.\"
|
||||
.Dd April 6, 2017
|
||||
.Dt openrc-shutdown 8 SMM
|
||||
.Os OpenRC
|
||||
.Sh NAME
|
||||
.Nm openrc-shutdown
|
||||
.Nd bring the system down
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl H , -halt
|
||||
.Op Fl k , -kexec
|
||||
.Op Fl p , -poweroff
|
||||
.Op Fl R , -reexec
|
||||
.Op Fl r , -reboot
|
||||
.Sh DESCRIPTION
|
||||
.Nm
|
||||
is the utility that communicates with openrc-init(8) to bring down the
|
||||
system or instruct openrc-init to re-execute itself. It supports the
|
||||
following options:
|
||||
.Bl -tag -width "poweroff"
|
||||
.It Fl H , -halt
|
||||
Stop all services, kill all remaining processes and halt the system.
|
||||
.It Fl k , -kexec
|
||||
Stop all services, kill all processes and boot directly into a new
|
||||
kernel loaded via kexec(8).
|
||||
.It Fl p , -poweroff
|
||||
Stop all services, kill all processes and power off the system.
|
||||
.It Fl R , -reexec
|
||||
instruct openrc-init to re-exec itself. This should be used after an
|
||||
upgrade of OpenRC if you are using openrc-init as your init process.
|
||||
.It Fl r , -reboot
|
||||
Stop all services, kill all processes and reboot the system.
|
||||
.El
|
||||
.Sh SEE ALSO
|
||||
.Xr openrc-init 8 ,
|
||||
.Xr kexec 8 ,
|
||||
.Sh AUTHORS
|
||||
.An William Hubbs <w.d.hubbs@gmail.com>
|
||||
@@ -11,5 +11,5 @@
|
||||
SFX= .GNU.in
|
||||
PKG_PREFIX?= /usr
|
||||
|
||||
CPPFLAGS+= -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
|
||||
CPPFLAGS+= -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
|
||||
LIBDL= -Wl,-Bdynamic -ldl
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
SFX= .Linux.in
|
||||
PKG_PREFIX?= /usr
|
||||
|
||||
CPPFLAGS+= -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
|
||||
CPPFLAGS+= -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
|
||||
LIBDL= -Wl,-Bdynamic -ldl
|
||||
|
||||
ifeq (${MKSELINUX},yes)
|
||||
|
||||
@@ -59,9 +59,6 @@ MANPREFIX?= ${UPREFIX}/share
|
||||
MANDIR?= ${MANPREFIX}/man
|
||||
MANMODE?= 0444
|
||||
|
||||
DATADIR?= ${UPREFIX}/share/openrc
|
||||
DATAMODE?= 0644
|
||||
|
||||
DOCDIR?= ${UPREFIX}/share/doc
|
||||
DOCMODE?= 0644
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ endif
|
||||
_installafter:
|
||||
ifeq (${OS},Linux)
|
||||
${INSTALL} -d ${DESTDIR}${SBINDIR}
|
||||
ln -sf ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
|
||||
ln -s ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
|
||||
endif
|
||||
|
||||
include ${MK}/scripts.mk
|
||||
|
||||
@@ -74,22 +74,11 @@ do
|
||||
|
||||
# Only generate dependencies for OpenRC scripts
|
||||
read one two three <"$RC_SERVICE"
|
||||
case "$one" in
|
||||
\#*/openrc-run) ;;
|
||||
\#*/runscript) ;;
|
||||
\#!)
|
||||
case "$two" in
|
||||
*/openrc-run) ;;
|
||||
*/runscript) ;;
|
||||
*)
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
[ "$one" = "#!@SBINDIR@/runscript" ] || \
|
||||
[ "$one" = "#!@SBINDIR@/openrc-run" ] || \
|
||||
[ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \
|
||||
[ "$one" = "#!" -a "$two" = "@SBINDIR@/openrc-run" ] || \
|
||||
continue
|
||||
unset one two three
|
||||
|
||||
RC_SVCNAME=${RC_SERVICE##*/} ; export RC_SVCNAME
|
||||
|
||||
@@ -85,40 +85,6 @@ get_bootparam()
|
||||
return 1
|
||||
}
|
||||
|
||||
get_bootparam_value()
|
||||
{
|
||||
local match="$1" which_value="$2" sep="$3" result value
|
||||
if [ -n "$match" -a -r /proc/cmdline ]; then
|
||||
set -- $(cat /proc/cmdline)
|
||||
while [ -n "$1" ]; do
|
||||
case "$1" in
|
||||
$match=*)
|
||||
value="${1##*=}"
|
||||
case "$which_value" in
|
||||
all)
|
||||
[ -z "$sep" ] && sep=' '
|
||||
if [ -z "$result" ]; then
|
||||
result="$value"
|
||||
else
|
||||
result="${result}${sep}${value}"
|
||||
fi
|
||||
;;
|
||||
last)
|
||||
result="$value"
|
||||
;;
|
||||
*)
|
||||
result="$value"
|
||||
break
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
fi
|
||||
echo $result
|
||||
}
|
||||
|
||||
# Called from openrc-run.sh or gendepends.sh
|
||||
_get_containers() {
|
||||
local c
|
||||
|
||||
@@ -3,5 +3,9 @@
|
||||
|
||||
SUBDIR= test libeinfo librc rc
|
||||
|
||||
ifeq (${MKTOOLS},yes)
|
||||
SUBDIR+= tools
|
||||
endif
|
||||
|
||||
MK= ../mk
|
||||
include ${MK}/subdir.mk
|
||||
|
||||
@@ -39,7 +39,6 @@ extern "C" {
|
||||
#define RC_CONFDIR RC_SYSCONFDIR "/conf.d"
|
||||
#define RC_PLUGINDIR RC_LIBDIR "/plugins"
|
||||
|
||||
#define RC_INIT_FIFO RC_SVCDIR"/init.ctl"
|
||||
#define RC_PROFILE_ENV RC_SYSCONFDIR "/profile.env"
|
||||
#define RC_SYS_WHITELIST RC_LIBEXECDIR "/conf.d/env_whitelist"
|
||||
#define RC_USR_WHITELIST RC_SYSCONFDIR "/conf.d/env_whitelist"
|
||||
|
||||
2
src/rc/.gitignore
vendored
2
src/rc/.gitignore
vendored
@@ -59,6 +59,4 @@ mark_service_failed
|
||||
rc-abort
|
||||
rc
|
||||
openrc
|
||||
openrc-init
|
||||
openrc-run
|
||||
openrc-shutdown
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
include ../../Makefile.inc
|
||||
MK= ../../mk
|
||||
include ${MK}/os.mk
|
||||
|
||||
SRCS= checkpath.c do_e.c do_mark_service.c do_service.c \
|
||||
do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
|
||||
mountinfo.c openrc-run.c rc-abort.c rc.c \
|
||||
@@ -13,10 +9,6 @@ ifeq (${MKSELINUX},yes)
|
||||
SRCS+= rc-selinux.c
|
||||
endif
|
||||
|
||||
ifeq (${OS},Linux)
|
||||
SRCS+= openrc-init.c openrc-shutdown.c
|
||||
endif
|
||||
|
||||
CLEANFILES= version.h rc-selinux.o
|
||||
|
||||
BINDIR= ${PREFIX}/bin
|
||||
@@ -42,11 +34,6 @@ RC_SBINPROGS= mark_service_starting mark_service_started \
|
||||
mark_service_inactive mark_service_wasinactive \
|
||||
mark_service_hotplugged mark_service_failed \
|
||||
rc-abort swclock
|
||||
|
||||
ifeq (${OS},Linux)
|
||||
SBINPROGS+= openrc-init openrc-shutdown
|
||||
endif
|
||||
|
||||
ALL_PROGS= ${BINPROGS} ${SBINPROGS} ${RC_BINPROGS} ${RC_SBINPROGS}
|
||||
CLEANFILES+= ${ALL_PROGS}
|
||||
|
||||
@@ -54,6 +41,8 @@ LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
|
||||
LOCAL_LDFLAGS=-L../librc -L../libeinfo
|
||||
LDADD+= -lutil -lrc -leinfo
|
||||
|
||||
include ../../Makefile.inc
|
||||
MK= ../../mk
|
||||
include ${MK}/prog.mk
|
||||
include ${MK}/gitver.mk
|
||||
include ${MK}/cc.mk
|
||||
@@ -107,9 +96,6 @@ veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
|
||||
fstabinfo: fstabinfo.o _usage.o rc-misc.o
|
||||
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
|
||||
|
||||
openrc-init: openrc-init.o
|
||||
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
|
||||
|
||||
is_newer_than: is_newer_than.o rc-misc.o
|
||||
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
|
||||
|
||||
@@ -128,9 +114,6 @@ mountinfo: mountinfo.o _usage.o rc-misc.o
|
||||
openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
|
||||
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
|
||||
|
||||
openrc-shutdown: openrc-shutdown.o _usage.o
|
||||
${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
|
||||
|
||||
openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o
|
||||
ifeq (${MKSELINUX},yes)
|
||||
openrc-run runscript: rc-selinux.o
|
||||
|
||||
@@ -1,206 +0,0 @@
|
||||
/*
|
||||
* openrc-init.c
|
||||
* This is the init process (pid 1) for OpenRC.
|
||||
*
|
||||
* This is based on code written by James Hammons <jlhamm@acm.org>, so
|
||||
* I would like to publically thank him for his work.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2017 The OpenRC Authors.
|
||||
* See the Authors file at the top-level directory of this distribution and
|
||||
* https://github.com/OpenRC/openrc/blob/master/AUTHORS
|
||||
*
|
||||
* This file is part of OpenRC. It is subject to the license terms in
|
||||
* the LICENSE file found in the top-level directory of this
|
||||
* distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
|
||||
* This file may not be copied, modified, propagated, or distributed
|
||||
* except according to the terms contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include "helpers.h"
|
||||
#include "rc.h"
|
||||
#include "version.h"
|
||||
|
||||
static const char *rc_default_runlevel = "default";
|
||||
|
||||
static pid_t do_openrc(const char *runlevel)
|
||||
{
|
||||
pid_t pid;
|
||||
sigset_t signals;
|
||||
|
||||
pid = fork();
|
||||
switch(pid) {
|
||||
case -1:
|
||||
perror("fork");
|
||||
break;
|
||||
case 0:
|
||||
setsid();
|
||||
/* unblock all signals */
|
||||
sigemptyset(&signals);
|
||||
sigprocmask(SIG_SETMASK, &signals, NULL);
|
||||
printf("Starting %s runlevel\n", runlevel);
|
||||
execl("/sbin/openrc", "/sbin/openrc", runlevel, NULL);
|
||||
perror("exec");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return pid;
|
||||
}
|
||||
|
||||
static void init(const char *default_runlevel)
|
||||
{
|
||||
const char *runlevel = NULL;
|
||||
pid_t pid;
|
||||
|
||||
pid = do_openrc("sysinit");
|
||||
waitpid(pid, NULL, 0);
|
||||
pid = do_openrc("boot");
|
||||
waitpid(pid, NULL, 0);
|
||||
if (default_runlevel)
|
||||
runlevel = default_runlevel;
|
||||
else
|
||||
runlevel = rc_conf_value("rc_default_runlevel");
|
||||
if (!runlevel)
|
||||
runlevel = rc_default_runlevel;
|
||||
if (!rc_runlevel_exists(runlevel)) {
|
||||
printf("%s is an invalid runlevel\n", runlevel);
|
||||
runlevel = rc_default_runlevel;
|
||||
}
|
||||
pid = do_openrc(runlevel);
|
||||
waitpid(pid, NULL, 0);
|
||||
}
|
||||
|
||||
static void handle_reexec(char *my_name)
|
||||
{
|
||||
execl(my_name, my_name, "reexec", NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
static void handle_shutdown(const char *runlevel, int cmd)
|
||||
{
|
||||
pid_t pid;
|
||||
|
||||
pid = do_openrc(runlevel);
|
||||
while (waitpid(pid, NULL, 0) != pid);
|
||||
printf("Sending the final term signal\n");
|
||||
kill(-1, SIGTERM);
|
||||
sleep(3);
|
||||
printf("Sending the final kill signal\n");
|
||||
kill(-1, SIGKILL);
|
||||
sync();
|
||||
reboot(cmd);
|
||||
}
|
||||
|
||||
static void reap_zombies(void)
|
||||
{
|
||||
pid_t pid;
|
||||
|
||||
for (;;) {
|
||||
pid = waitpid(-1, NULL, WNOHANG);
|
||||
if (pid == 0)
|
||||
break;
|
||||
else if (pid == -1) {
|
||||
if (errno == ECHILD)
|
||||
break;
|
||||
perror("waitpid");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void signal_handler(int sig)
|
||||
{
|
||||
switch(sig) {
|
||||
case SIGINT:
|
||||
handle_shutdown("reboot", RB_AUTOBOOT);
|
||||
break;
|
||||
case SIGCHLD:
|
||||
reap_zombies();
|
||||
break;
|
||||
default:
|
||||
printf("Unknown signal received, %d\n", sig);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
char *default_runlevel;
|
||||
char buf[2048];
|
||||
int count;
|
||||
FILE *fifo;
|
||||
bool reexec = false;
|
||||
sigset_t signals;
|
||||
struct sigaction sa;
|
||||
|
||||
if (getpid() != 1)
|
||||
return 1;
|
||||
|
||||
printf("OpenRC init version %s starting\n", VERSION);
|
||||
|
||||
if (argc > 1)
|
||||
default_runlevel = argv[1];
|
||||
else
|
||||
default_runlevel = NULL;
|
||||
|
||||
if (default_runlevel && strcmp(default_runlevel, "reexec") == 0)
|
||||
reexec = true;
|
||||
|
||||
/* block all signals we do not handle */
|
||||
sigfillset(&signals);
|
||||
sigdelset(&signals, SIGCHLD);
|
||||
sigdelset(&signals, SIGINT);
|
||||
sigprocmask(SIG_SETMASK, &signals, NULL);
|
||||
|
||||
/* install signal handler */
|
||||
memset(&sa, 0, sizeof(sa));
|
||||
sa.sa_handler = signal_handler;
|
||||
sigaction(SIGCHLD, &sa, NULL);
|
||||
sigaction(SIGINT, &sa, NULL);
|
||||
reboot(RB_DISABLE_CAD);
|
||||
|
||||
if (! reexec)
|
||||
init(default_runlevel);
|
||||
|
||||
if (mkfifo(RC_INIT_FIFO, 0600) == -1 && errno != EEXIST)
|
||||
perror("mkfifo");
|
||||
|
||||
for (;;) {
|
||||
/* This will block until a command is sent down the pipe... */
|
||||
fifo = fopen(RC_INIT_FIFO, "r");
|
||||
if (!fifo) {
|
||||
if (errno != EINTR)
|
||||
perror("fopen");
|
||||
continue;
|
||||
}
|
||||
count = fread(buf, 1, 2048, fifo);
|
||||
buf[count] = 0;
|
||||
fclose(fifo);
|
||||
printf("PID1: Received \"%s\" from FIFO...\n", buf);
|
||||
if (strcmp(buf, "halt") == 0)
|
||||
handle_shutdown("shutdown", RB_HALT_SYSTEM);
|
||||
else if (strcmp(buf, "kexec") == 0)
|
||||
handle_shutdown("reboot", RB_KEXEC);
|
||||
else if (strcmp(buf, "poweroff") == 0)
|
||||
handle_shutdown("shutdown", RB_POWER_OFF);
|
||||
else if (strcmp(buf, "reboot") == 0)
|
||||
handle_shutdown("reboot", RB_AUTOBOOT);
|
||||
else if (strcmp(buf, "reexec") == 0)
|
||||
handle_reexec(argv[0]);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -1,132 +0,0 @@
|
||||
/*
|
||||
* openrc-shutdown.c
|
||||
* If you are using OpenRC's provided init, this will shut down or
|
||||
* reboot your system.
|
||||
*
|
||||
* This is based on code written by James Hammons <jlhamm@acm.org>, so
|
||||
* I would like to publically thank him for his work.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright 2017 The OpenRC Authors.
|
||||
* See the Authors file at the top-level directory of this distribution and
|
||||
* https://github.com/OpenRC/openrc/blob/master/AUTHORS
|
||||
*
|
||||
* This file is part of OpenRC. It is subject to the license terms in
|
||||
* the LICENSE file found in the top-level directory of this
|
||||
* distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
|
||||
* This file may not be copied, modified, propagated, or distributed
|
||||
* except according to the terms contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
#include <signal.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "einfo.h"
|
||||
#include "rc.h"
|
||||
#include "helpers.h"
|
||||
#include "_usage.h"
|
||||
|
||||
const char *applet = NULL;
|
||||
const char *extraopts = NULL;
|
||||
const char *getoptstring = "HkpRr" getoptstring_COMMON;
|
||||
const struct option longopts[] = {
|
||||
{ "halt", no_argument, NULL, 'H'},
|
||||
{ "kexec", no_argument, NULL, 'k'},
|
||||
{ "poweroff", no_argument, NULL, 'p'},
|
||||
{ "reexec", no_argument, NULL, 'R'},
|
||||
{ "reboot", no_argument, NULL, 'r'},
|
||||
longopts_COMMON
|
||||
};
|
||||
const char * const longopts_help[] = {
|
||||
"halt the system",
|
||||
"reboot the system using kexec",
|
||||
"power off the system",
|
||||
"re-execute init (use after upgrading)",
|
||||
"reboot the system",
|
||||
longopts_help_COMMON
|
||||
};
|
||||
const char *usagestring = NULL;
|
||||
const char *exclusive = "Select one of "
|
||||
"--halt, --kexec, --poweroff, --reexec or --reboot";
|
||||
|
||||
static void send_cmd(const char *cmd)
|
||||
{
|
||||
FILE *fifo;
|
||||
size_t ignored;
|
||||
|
||||
fifo = fopen(RC_INIT_FIFO, "w");
|
||||
|
||||
if (!fifo) {
|
||||
perror("fopen");
|
||||
return;
|
||||
}
|
||||
|
||||
ignored = fwrite(cmd, 1, strlen(cmd), fifo);
|
||||
if (ignored != strlen(cmd))
|
||||
printf("Error writing to init fifo\n");
|
||||
fclose(fifo);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int opt;
|
||||
int cmd_count = 0;
|
||||
bool do_halt = false;
|
||||
bool do_kexec = false;
|
||||
bool do_poweroff = false;
|
||||
bool do_reboot = false;
|
||||
bool do_reexec = false;
|
||||
|
||||
applet = basename_c(argv[0]);
|
||||
if (geteuid() != 0)
|
||||
eerrorx("%s: you must be root\n", applet);
|
||||
while ((opt = getopt_long(argc, argv, getoptstring,
|
||||
longopts, (int *) 0)) != -1)
|
||||
{
|
||||
switch (opt) {
|
||||
case 'H':
|
||||
do_halt = true;
|
||||
cmd_count++;
|
||||
break;
|
||||
case 'k':
|
||||
do_kexec = true;
|
||||
cmd_count++;
|
||||
break;
|
||||
case 'p':
|
||||
do_poweroff = true;
|
||||
cmd_count++;
|
||||
break;
|
||||
case 'R':
|
||||
do_reexec = true;
|
||||
cmd_count++;
|
||||
break;
|
||||
case 'r':
|
||||
do_reboot = true;
|
||||
cmd_count++;
|
||||
break;
|
||||
case_RC_COMMON_GETOPT
|
||||
}
|
||||
}
|
||||
if (cmd_count != 1) {
|
||||
eerror("%s: %s\n", applet, exclusive);
|
||||
usage(EXIT_FAILURE);
|
||||
}
|
||||
if (do_halt)
|
||||
send_cmd("halt");
|
||||
else if (do_kexec)
|
||||
send_cmd("kexec");
|
||||
else if (do_poweroff)
|
||||
send_cmd("poweroff");
|
||||
else if (do_reboot)
|
||||
send_cmd("reboot");
|
||||
else if (do_reexec)
|
||||
send_cmd("reexec");
|
||||
return 0;
|
||||
}
|
||||
@@ -960,9 +960,6 @@ int main(int argc, char **argv)
|
||||
if (redirect_stdout || redirect_stderr)
|
||||
eerrorx("%s: --stdout and --stderr are only relevant"
|
||||
" with --start", applet);
|
||||
if (start_wait)
|
||||
ewarn("using --wait with --stop has no effect,"
|
||||
" use --retry instead");
|
||||
} else {
|
||||
if (!exec)
|
||||
eerrorx("%s: nothing to start", applet);
|
||||
@@ -1015,11 +1012,7 @@ int main(int argc, char **argv)
|
||||
eerror("%s: %s does not exist", applet,
|
||||
*exec_file ? exec_file : exec);
|
||||
exit(EXIT_FAILURE);
|
||||
|
||||
}
|
||||
if (start && retry)
|
||||
ewarn("using --retry with --start has no effect,"
|
||||
" use --wait instead");
|
||||
|
||||
/* If we don't have a pidfile we should check if it's interpreted
|
||||
* or not. If it we, we need to pass the interpreter through
|
||||
|
||||
5
src/tools/Makefile
Normal file
5
src/tools/Makefile
Normal file
@@ -0,0 +1,5 @@
|
||||
DIR= ${UPREFIX}/bin
|
||||
BIN= deptree2dot
|
||||
|
||||
MK= ../../mk
|
||||
include ${MK}/scripts.mk
|
||||
@@ -1,20 +0,0 @@
|
||||
# Copyright (c) 2017 the OpenRC Authors.
|
||||
# See the Authors file at the top-level directory of this distribution and
|
||||
# https://github.com/OpenRC/openrc/blob/master/AUTHORS
|
||||
#
|
||||
# This file is part of OpenRC. It is subject to the license terms in
|
||||
# the LICENSE file found in the top-level directory of this
|
||||
# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
|
||||
# This file may not be copied, modified, propagated, or distributed
|
||||
# except according to the terms contained in the LICENSE file.
|
||||
|
||||
MK= ../mk
|
||||
include ${MK}/os.mk
|
||||
|
||||
SUBDIR= deptree2dot init.d.examples openvpn
|
||||
|
||||
ifeq (${OS},Linux)
|
||||
SUBDIR+= sysvinit
|
||||
endif
|
||||
|
||||
include ${MK}/subdir.mk
|
||||
@@ -1,9 +0,0 @@
|
||||
MK= ../../mk
|
||||
include ${MK}/os.mk
|
||||
|
||||
DIR= ${DATADIR}/support/deptree2dot
|
||||
BIN= deptree2dot
|
||||
INC= README.md
|
||||
|
||||
|
||||
include ${MK}/scripts.mk
|
||||
@@ -1,11 +0,0 @@
|
||||
# deptree2dot - Graph the OpenRC Dependency Tree
|
||||
|
||||
This utility can be used to graph the OpenRC dependency tree. It
|
||||
requires perl5.x and converts the tree to a .dot file which can be
|
||||
processed by graphviz.
|
||||
|
||||
Example usage:
|
||||
|
||||
$ chmod +x deptree2dot
|
||||
$deptree2dot > deptree.dot
|
||||
$deptree2dot | dot -Tpng -o deptree.png
|
||||
@@ -1,3 +0,0 @@
|
||||
The service scripts in this directory are meant as examples only.
|
||||
They are not installed by default as the scripts will need tweaking on a
|
||||
per distro basis. They are also non essential to the operation of the system.
|
||||
@@ -1,9 +0,0 @@
|
||||
MK= ../../mk
|
||||
include ${MK}/os.mk
|
||||
|
||||
DIR= ${DATADIR}/support/openvpn
|
||||
BIN= down.sh up.sh
|
||||
INC= README.md
|
||||
|
||||
|
||||
include ${MK}/scripts.mk
|
||||
@@ -1,8 +0,0 @@
|
||||
MK= ../../mk
|
||||
include ${MK}/os.mk
|
||||
|
||||
DIR= ${DATADIR}/support/sysvinit
|
||||
INC= inittab README.md
|
||||
|
||||
|
||||
include ${MK}/scripts.mk
|
||||
@@ -9,10 +9,6 @@ srcdir=${srcdir:-.}
|
||||
top_builddir=${top_builddir:-${top_srcdir}}
|
||||
builddir=${builddir:-${srcdir}}
|
||||
|
||||
LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
|
||||
PATH=${top_builddir}/src/rc:${PATH}
|
||||
export LD_LIBRARY_PATH PATH
|
||||
|
||||
if [ ! -f ${top_srcdir}/sh/functions.sh ] ; then
|
||||
echo "functions.sh not yet created !?" 1>&2
|
||||
exit 1
|
||||
@@ -21,3 +17,7 @@ elif ! . ${top_srcdir}/sh/functions.sh; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
|
||||
PATH=${top_builddir}/src/rc:${PATH}
|
||||
export LD_LIBRARY_PATH PATH
|
||||
|
||||
|
||||
Reference in New Issue
Block a user