Compare commits
9 Commits
openrc-0.6
...
openrc-0.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
449080e145 | ||
|
|
062223a5df | ||
|
|
18064e19f6 | ||
|
|
cdf07b5970 | ||
|
|
82b265016a | ||
|
|
bdfab242b7 | ||
|
|
4ca32808dd | ||
|
|
9e5b9abf40 | ||
|
|
ac37dc2764 |
@@ -1,3 +1,3 @@
|
|||||||
NAME= openrc
|
NAME= openrc
|
||||||
VERSION= 0.6.4
|
VERSION= 0.6.7
|
||||||
PKG= ${NAME}-${VERSION}
|
PKG= ${NAME}-${VERSION}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ cleanup_tmp_dir()
|
|||||||
# each user gets a private directory with immutable
|
# each user gets a private directory with immutable
|
||||||
# bit set; remove the immutable bit before trying to
|
# bit set; remove the immutable bit before trying to
|
||||||
# remove it.
|
# remove it.
|
||||||
[ -d /tmp/.private ] && chattr -R -a /tmp/.private
|
[ -d /tmp/.private ] && chattr -R -a /tmp/.private 2> /dev/null
|
||||||
|
|
||||||
find $startopts ! -name . \
|
find $startopts ! -name . \
|
||||||
! -path "./lost+found" \
|
! -path "./lost+found" \
|
||||||
|
|||||||
@@ -14,13 +14,16 @@ depend()
|
|||||||
start()
|
start()
|
||||||
{
|
{
|
||||||
# Mount local filesystems in /etc/fstab.
|
# Mount local filesystems in /etc/fstab.
|
||||||
local types="noproc" x=
|
local types="noproc" x= no_netdev=
|
||||||
for x in $net_fs_list; do
|
for x in $net_fs_list; do
|
||||||
types="${types},${x}"
|
types="${types},${x}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ "$RC_UNAME" = Linux ]; then
|
||||||
|
no_netdev="-O no_netdev"
|
||||||
|
fi
|
||||||
ebegin "Mounting local filesystems"
|
ebegin "Mounting local filesystems"
|
||||||
mount -at "$types"
|
mount -at "$types" $no_netdev
|
||||||
eend $? "Some local filesystem failed to mount"
|
eend $? "Some local filesystem failed to mount"
|
||||||
|
|
||||||
# Always return 0 - some local mounts may not be critical for boot
|
# Always return 0 - some local mounts may not be critical for boot
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
depend()
|
depend()
|
||||||
{
|
{
|
||||||
use hostname
|
|
||||||
before bootmisc logger
|
before bootmisc logger
|
||||||
keyword -prefix
|
keyword -prefix
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ ifplugd_pre_start()
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We don't work on bonded, bridges, tun/tap or vlan
|
# We don't work on bonded, bridges, tun/tap, vlan or wireless
|
||||||
for f in bond bridge tuntap vlan; do
|
for f in bond bridge tuntap vlan wireless; do
|
||||||
if type "_is_${f}" >/dev/null 2>&1; then
|
if type "_is_${f}" >/dev/null 2>&1; then
|
||||||
if _is_${f}; then
|
if _is_${f}; then
|
||||||
veinfo "ifplugd does not work with ${f}"
|
veinfo "ifplugd does not work with ${f}"
|
||||||
|
|||||||
@@ -350,6 +350,8 @@ svc_exec(const char *arg1, const char *arg2)
|
|||||||
size_t bytes;
|
size_t bytes;
|
||||||
bool prefixed = false;
|
bool prefixed = false;
|
||||||
int slave_tty;
|
int slave_tty;
|
||||||
|
sigset_t sigchldmask;
|
||||||
|
sigset_t oldmask;
|
||||||
|
|
||||||
/* Setup our signal pipe */
|
/* Setup our signal pipe */
|
||||||
if (pipe(signal_pipe) == -1)
|
if (pipe(signal_pipe) == -1)
|
||||||
@@ -439,10 +441,17 @@ svc_exec(const char *arg1, const char *arg2)
|
|||||||
}
|
}
|
||||||
|
|
||||||
free(buffer);
|
free(buffer);
|
||||||
|
|
||||||
|
sigemptyset (&sigchldmask);
|
||||||
|
sigaddset (&sigchldmask, SIGCHLD);
|
||||||
|
sigprocmask (SIG_BLOCK, &sigchldmask, &oldmask);
|
||||||
|
|
||||||
close(signal_pipe[0]);
|
close(signal_pipe[0]);
|
||||||
close(signal_pipe[1]);
|
close(signal_pipe[1]);
|
||||||
signal_pipe[0] = signal_pipe[1] = -1;
|
signal_pipe[0] = signal_pipe[1] = -1;
|
||||||
|
|
||||||
|
sigprocmask (SIG_SETMASK, &oldmask, NULL);
|
||||||
|
|
||||||
if (master_tty >= 0) {
|
if (master_tty >= 0) {
|
||||||
/* Why did we do this? */
|
/* Why did we do this? */
|
||||||
/* signal (SIGWINCH, SIG_IGN); */
|
/* signal (SIGWINCH, SIG_IGN); */
|
||||||
|
|||||||
Reference in New Issue
Block a user