Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
df28002b72 | ||
|
|
66ed8082d0 | ||
|
|
c2d256bafb | ||
|
|
f48d9c33a5 | ||
|
|
6d4e843397 | ||
|
|
0513cd3964 | ||
|
|
72bb2e57de |
270
ChangeLog
270
ChangeLog
@@ -1,3 +1,59 @@
|
||||
commit 66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
sh/openrc-run: source service script before ulimit is processed
|
||||
|
||||
This is needed to allow the service script author to set a default for
|
||||
rc_ulimit inside the service script.
|
||||
|
||||
commit c2d256bafb9d1dfafbfd0846c035c5d26f7449c8
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
man/openrc-run.8: document fstabinfo and mountinfo
|
||||
|
||||
X-Gentoo-Bug: 592374
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=592374
|
||||
|
||||
commit f48d9c33a5c708c871d6657a39485d1c0c735548
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
man/openrc-run.8: document _pre and _post functions
|
||||
|
||||
Fixes https://github.com/openrc/openrc/issues/155.
|
||||
|
||||
commit 6d4e8433974fd8567885635ae0454031290f96b1
|
||||
Author: Jason Graham <jgraha8@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
fix ENT macro usage
|
||||
|
||||
X-Gentoo-Bug: 624796
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624796
|
||||
|
||||
commit 0513cd3964a9564e0ba39b50aa8ebd3d7e9a3920
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
version 0.29
|
||||
|
||||
commit 72bb2e57de935ab46ad000f97a5720265bed9342
|
||||
Author: John R. Graham <john_r_graham@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Typo fix
|
||||
|
||||
X-Gentoo-Bug: 624908
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624908
|
||||
|
||||
commit 84c5da30695db89d686d3c28c7cacdf172cbf429
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Update ChangeLog
|
||||
|
||||
commit b35099cb707e333b6b8d30d956ffa93bcd2da0ab
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
@@ -1456,217 +1512,3 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
X-Gentoo-Bug: 342313
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=342313
|
||||
|
||||
commit 1a55d46645b376cd27f394796934150120a08387
|
||||
Author: Raymond Jennings <shentino@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
local.d/README: typo fix
|
||||
|
||||
X-Gentoo-Bug: 591258
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=591258
|
||||
|
||||
commit cae3976ef1276ce33aa7e49474f13499a48a3fe6
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d: Add runsvdir to ignore patterns
|
||||
|
||||
commit da28a3d367b6078deda6bc205806b43b971e67a9
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d: initial service adjustments for docker support
|
||||
|
||||
Add -docker keyword to the same scripts that have -lxc keyword.
|
||||
|
||||
commit ca8c29ee60b0e8ca89091aaf801725bd71e28001
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
librc: fix Docker auto detection
|
||||
|
||||
The original auto detection of Docker containers assumed the presence of
|
||||
a container environment variable. However, Docker-1.12 does not
|
||||
implement this, and I'm not sure which versions of docker implemented
|
||||
it.
|
||||
|
||||
The new test is for the presence of a file named .dockerenv in the
|
||||
root directory.
|
||||
|
||||
commit f62253b8334a85dac4671e42817b96a3bedd1881
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Add support for runit
|
||||
|
||||
X-Gentoo-Bug: 501364
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=501364
|
||||
|
||||
commit f2c2e2dd5a5e0a22da4dcabea6615d0f4697a962
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d/sysctl.in: typo fix
|
||||
|
||||
commit 94b98430cb83a8f4e62d837100fc357e9eb12ca6
|
||||
Author: Kenneth Lakin <kennethlakin@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
start-stop-daemon: Add SSD_IONICELEVEL
|
||||
|
||||
This is the disk IO counterpart to SSD_NICELEVEL.
|
||||
Modified by William Hubbs to add the variable to the start-stop-daemon
|
||||
man page.
|
||||
|
||||
This fixes #69.
|
||||
|
||||
commit b19d0a40d7f20987323d5af91469c720ead39561
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d/loopback: remove unnecessary stop function
|
||||
|
||||
commit 0c229faf7e6a57bcff70f2143b83cb69a34c89f4
|
||||
Author: Martin Väth <martin@mvath.de>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
tmpfiles.sh: Support lines with q Q h H
|
||||
|
||||
btrfs support is not implemented yet (for q Q v), but at least tmpfiles.sh
|
||||
no longer chokes about tmpfiles.d lines of recent systemd versions
|
||||
|
||||
This fixes #87.
|
||||
|
||||
commit 3092e310acd376fc626cc051549e02bcd7697aed
|
||||
Author: Mike Gilbert <floppym@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
tmpfiles: Accept filenames as command line arguments
|
||||
|
||||
This brings us closer to being able to use tmpfiles.sh as a full
|
||||
replacement for systemd-tmpfiles.
|
||||
|
||||
This closes #83.
|
||||
|
||||
commit 671911762d1bcd90c10d8ac0eb30fe10be4a65f6
|
||||
Author: Mike Gilbert <floppym@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
tmpfiles: Process command line before gathering config files
|
||||
|
||||
This is part of #83.
|
||||
|
||||
commit 7d68839e9ea89b0a92aef69a9b4fd298554bb9b1
|
||||
Author: Mike Gilbert <floppym@gentoo.org>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
tmpfiles: Make unrecognized options fatal
|
||||
|
||||
This is part of #83.
|
||||
|
||||
commit 5341a925c15934674031aebb97533b0adcd10236
|
||||
Author: Jakub Jirutka <jakub@jirutka.cz>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
s6-guide: fix typo
|
||||
|
||||
This fixes #92.
|
||||
|
||||
commit 3adb8fb389caaafbed1be13c5ac4d96214c8eed3
|
||||
Author: Doug Freed <dwfreed@mtu.edu>
|
||||
Commit: Doug Freed <dwfreed@mtu.edu>
|
||||
|
||||
rc-logger: refuse to cat TMPLOG into itself
|
||||
|
||||
This prevents an infinite loop in case somebody decides to set
|
||||
rc_log_path to match TMPLOG.
|
||||
|
||||
commit 8927a37fb790e718c956376242a532ab9d1755e7
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
etc: remove rc.conf.* file fragments
|
||||
|
||||
commit b085b2cda58bc884acb959e48f14fb044c983042
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
etc: create default rc.conf
|
||||
|
||||
Before now, /etc/rc.conf was created by the build system from multiple
|
||||
rc.conf.* file fragments and there was no reason for this.
|
||||
|
||||
commit daf93977641201f16c477b075ce9055a1da8f7b3
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
init.d: combine sysctl scripts
|
||||
|
||||
We had separate sysctl scripts for each operating system. However, there
|
||||
is no need to do this since we can detect the operating system at
|
||||
runtime with $RC_UNAME.
|
||||
|
||||
commit 2984504c887afc9a36610eb7c20b097f7d1e70d0
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
conf.d: remove staticroute file fragments
|
||||
|
||||
commit 35e8386c24df6483f2918979dae150421f7151df
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
conf.d: makestaticroute file static
|
||||
|
||||
commit 2108285d64e2ee8cc03fbe544efc3752fe349bdd
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
conf.d: remove network file fragnents
|
||||
|
||||
commit a3133fec250eca3cdfb460c2ce26c707fd593c09
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
conf.d: make network file static
|
||||
|
||||
commit 314ae3dc781d7ae8fc26c276a85b0dc6ab6bc326
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
modules: add support for FreeBSD
|
||||
|
||||
This is based on a patch submitted by
|
||||
Joe Maloney <pkgdemonteam@gmail.com>.
|
||||
|
||||
This fixes #91.
|
||||
|
||||
commit 695be59083cdf0d2ff9296f2c210e591c51bdf40
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
rc-status: add -m/--manual option to show manually started services
|
||||
|
||||
X-Gentoo-Bug: 585906
|
||||
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=585906
|
||||
|
||||
commit c962678dd6ab1314b55c2a3bcdae03902bda39b8
|
||||
Author: Doug Freed <dwfreed@mtu.edu>
|
||||
Commit: Doug Freed <dwfreed@mtu.edu>
|
||||
|
||||
rc: Rename some static variables to kill warnings
|
||||
|
||||
commit 3a1262703fd20d2e8288d13d908fb282c77d1793
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
Remove the DEBUG_MEMORY macro
|
||||
|
||||
This fixes #43.
|
||||
|
||||
commit 20035210bdf5d5729734457f35f5f32a53a5b3ad
|
||||
Author: William Hubbs <w.d.hubbs@gmail.com>
|
||||
Commit: William Hubbs <w.d.hubbs@gmail.com>
|
||||
|
||||
make variable aflag a boolean show_all
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
NAME= openrc
|
||||
VERSION= 0.28
|
||||
VERSION= 0.29
|
||||
PKG= ${NAME}-${VERSION}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#no_umounts="/dir1:/var/dir2"
|
||||
#
|
||||
# Mark certain mount points as critical.
|
||||
# This contains aspace separated list of mount points which should be
|
||||
# This contains a space separated list of mount points which should be
|
||||
# considered critical. If one of these mount points cannot be mounted,
|
||||
# localmount will fail.
|
||||
# By default, this is empty.
|
||||
|
||||
@@ -284,6 +284,18 @@ system.
|
||||
To see how to influence dependencies in configuration files, see the
|
||||
.Sx FILES
|
||||
section below.
|
||||
.Sh _pre AND _post FUNCTIONS
|
||||
Any command defined in extra_commands, extra_started_commands or
|
||||
extra_stopped_commands can have _pre and _post functions in the service
|
||||
script. If the command function is called foo, the_pre and _post
|
||||
functions for it should be called foo_pre and foo_post.
|
||||
.Pp
|
||||
These functions should be used to perform preparation before the
|
||||
command is run and cleanup after the command completes. In order for
|
||||
.Nm
|
||||
to record the command as being run successfully, the _pre
|
||||
function, command function itself and the _post function should all exit
|
||||
with a zero return code.
|
||||
.Sh BUILTINS
|
||||
.Nm
|
||||
defines some builtin functions that you can use inside your service scripts:
|
||||
@@ -433,6 +445,42 @@ Also, the -d, -f or -p options should not be specified along with this option.
|
||||
.Pp
|
||||
The -q option suppresses all informational output. If it is specified
|
||||
twice, all error messages are suppressed as well.
|
||||
.Ic fstabinfo
|
||||
.Op Fl M , -mount
|
||||
.Op Fl R , -remount
|
||||
.Op Fl b , -blockdevice
|
||||
.Op Fl m , -mountargs
|
||||
.Op Fl o , -options
|
||||
.Op Fl p , -passno Ar passno
|
||||
.Op Fl t , -type Ar fstype
|
||||
.Ar path
|
||||
.Xc
|
||||
If -b, -m, -o, -p or -t is specified,the appropriate information is
|
||||
extracted from fstab. If -M or -R are given, file systems are mounted or
|
||||
remounted.
|
||||
.Pp
|
||||
The -q option suppresses all informational output. If it is specified
|
||||
twice, all error messages are suppressed as well.
|
||||
.Ic mountinfo
|
||||
.Op Fl f, -fstype-regex Ar regex
|
||||
.Op Fl F, -skip-fstype-regex Ar regex
|
||||
.Op Fl n, -node-regex Ar regex
|
||||
.Op Fl N, -skip-node-regex Ar regex
|
||||
.Op Fl o, -options-regex Ar regex
|
||||
.Op Fl O, -skip-options-regex Ar regex
|
||||
.Op Fl p, -point-regex Ar regex
|
||||
.Op Fl P, -skip-point-regex Ar regex
|
||||
.Op Fl e, -netdev
|
||||
.Op Fl E, -nonetdev
|
||||
.Op Fl i, -options
|
||||
.Op Fl s, -fstype
|
||||
.Op Fl t, -node
|
||||
.Ar mount1 mount2 ...
|
||||
.Xc
|
||||
The f, F, n, N, o, O, p, P, e and E options specify what you want to
|
||||
search for or skip in the mounted file systems. The i, s and t options
|
||||
specify what you want to display. If no mount points are given, all
|
||||
mount points will be considered.
|
||||
.It Ic yesno Ar value
|
||||
If
|
||||
.Ar value
|
||||
|
||||
@@ -243,6 +243,9 @@ sourcex "@LIBEXECDIR@/sh/s6.sh"
|
||||
sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh"
|
||||
sourcex "@LIBEXECDIR@/sh/supervise-daemon.sh"
|
||||
|
||||
# Load our script
|
||||
sourcex "$RC_SERVICE"
|
||||
|
||||
# Set verbose mode
|
||||
if yesno "${rc_verbose:-$RC_VERBOSE}"; then
|
||||
EINFO_VERBOSE=yes
|
||||
@@ -272,9 +275,6 @@ for _cmd; do
|
||||
fi
|
||||
done
|
||||
|
||||
# Load our script
|
||||
sourcex "$RC_SERVICE"
|
||||
|
||||
eval "printf '%s\n' $required_dirs" | while read _d; do
|
||||
if [ -n "$_d" ] && [ ! -d "$_d" ]; then
|
||||
eerror "$RC_SVCNAME: \`$_d' is not a directory"
|
||||
|
||||
@@ -35,11 +35,11 @@
|
||||
# define GET_ENT getmntent (fp)
|
||||
# define GET_ENT_FILE(_name) getmntfile (_name)
|
||||
# define END_ENT endmntent (fp)
|
||||
# define ENT_BLOCKDEVICE(_ent) ent->mnt_fsname
|
||||
# define ENT_FILE(_ent) ent->mnt_dir
|
||||
# define ENT_TYPE(_ent) ent->mnt_type
|
||||
# define ENT_OPTS(_ent) ent->mnt_opts
|
||||
# define ENT_PASS(_ent) ent->mnt_passno
|
||||
# define ENT_BLOCKDEVICE(_ent) (_ent)->mnt_fsname
|
||||
# define ENT_FILE(_ent) (_ent)->mnt_dir
|
||||
# define ENT_TYPE(_ent) (_ent)->mnt_type
|
||||
# define ENT_OPTS(_ent) (_ent)->mnt_opts
|
||||
# define ENT_PASS(_ent) (_ent)->mnt_passno
|
||||
#else
|
||||
# define HAVE_GETFSENT
|
||||
# include <fstab.h>
|
||||
@@ -48,11 +48,11 @@
|
||||
# define GET_ENT getfsent ()
|
||||
# define GET_ENT_FILE(_name) getfsfile (_name)
|
||||
# define END_ENT endfsent ()
|
||||
# define ENT_BLOCKDEVICE(_ent) ent->fs_spec
|
||||
# define ENT_TYPE(_ent) ent->fs_vfstype
|
||||
# define ENT_FILE(_ent) ent->fs_file
|
||||
# define ENT_OPTS(_ent) ent->fs_mntops
|
||||
# define ENT_PASS(_ent) ent->fs_passno
|
||||
# define ENT_BLOCKDEVICE(_ent) (_ent)->fs_spec
|
||||
# define ENT_TYPE(_ent) (_ent)->fs_vfstype
|
||||
# define ENT_FILE(_ent) (_ent)->fs_file
|
||||
# define ENT_OPTS(_ent) (_ent)->fs_mntops
|
||||
# define ENT_PASS(_ent) (_ent)->fs_passno
|
||||
#endif
|
||||
|
||||
#include "einfo.h"
|
||||
@@ -114,24 +114,24 @@ do_mount(struct ENT *ent, bool remount)
|
||||
|
||||
argv[0] = UNCONST("mount");
|
||||
argv[1] = UNCONST("-o");
|
||||
argv[2] = ENT_OPTS(*ent);
|
||||
argv[2] = ENT_OPTS(ent);
|
||||
argv[3] = UNCONST("-t");
|
||||
argv[4] = ENT_TYPE(*ent);
|
||||
argv[4] = ENT_TYPE(ent);
|
||||
if (!remount) {
|
||||
argv[5] = ENT_BLOCKDEVICE(*ent);
|
||||
argv[6] = ENT_FILE(*ent);
|
||||
argv[5] = ENT_BLOCKDEVICE(ent);
|
||||
argv[6] = ENT_FILE(ent);
|
||||
argv[7] = NULL;
|
||||
} else {
|
||||
#ifdef __linux__
|
||||
argv[5] = UNCONST("-o");
|
||||
argv[6] = UNCONST("remount");
|
||||
argv[7] = ENT_BLOCKDEVICE(*ent);
|
||||
argv[8] = ENT_FILE(*ent);
|
||||
argv[7] = ENT_BLOCKDEVICE(ent);
|
||||
argv[8] = ENT_FILE(ent);
|
||||
argv[9] = NULL;
|
||||
#else
|
||||
argv[5] = UNCONST("-u");
|
||||
argv[6] = ENT_BLOCKDEVICE(*ent);
|
||||
argv[7] = ENT_FILE(*ent);
|
||||
argv[6] = ENT_BLOCKDEVICE(ent);
|
||||
argv[7] = ENT_FILE(ent);
|
||||
argv[8] = NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user