Merge init-common-post code into BSD init script
This code is no longer part of the initialization script for Linux, so we can move it into the init script for *BSD which is the only place it is used.
This commit is contained in:
parent
257e10a1ab
commit
54ab12d218
1
sh/.gitignore
vendored
1
sh/.gitignore
vendored
@ -1,6 +1,5 @@
|
||||
functions.sh
|
||||
gendepends.sh
|
||||
init-common-post.sh
|
||||
rc-functions.sh
|
||||
runscript.sh
|
||||
cgroup-release-agent.sh
|
||||
|
@ -1,7 +1,7 @@
|
||||
DIR= ${LIBEXECDIR}/sh
|
||||
SRCS= init.sh.in functions.sh.in gendepends.sh.in init-common-post.sh.in \
|
||||
SRCS= init.sh.in functions.sh.in gendepends.sh.in \
|
||||
rc-functions.sh.in runscript.sh.in tmpfiles.sh.in ${SRCS-${OS}}
|
||||
INC= init-common-post.sh rc-mount.sh functions.sh rc-functions.sh
|
||||
INC= rc-mount.sh functions.sh rc-functions.sh
|
||||
BIN= gendepends.sh init.sh runscript.sh tmpfiles.sh ${BIN-${OS}}
|
||||
|
||||
INSTALLAFTER= _installafter
|
||||
|
@ -1,25 +0,0 @@
|
||||
# Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
|
||||
# Released under the 2-clause BSD license.
|
||||
|
||||
# mount $RC_SVCDIR as something we can write to if it's not rw
|
||||
# On vservers, / is always rw at this point, so we need to clean out
|
||||
# the old service state data
|
||||
: ${RC_LIBEXECDIR:=@LIBEXECDIR@}
|
||||
: ${RC_SVCDIR:=@LIBEXECDIR@/init.d}
|
||||
case "$(openrc --sys)" in
|
||||
OPENVZ|VSERVER) rm -rf "$RC_SVCDIR"/*;;
|
||||
*) if mountinfo --quiet "$RC_SVCDIR"; then
|
||||
rm -rf "$RC_SVCDIR"/*
|
||||
else
|
||||
mount_svcdir
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
retval=$?
|
||||
|
||||
if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
|
||||
cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
|
||||
fi
|
||||
|
||||
echo sysinit >"$RC_SVCDIR"/softlevel
|
||||
exit $retval
|
@ -29,4 +29,25 @@ if [ -z "$RC_SYS" -a "$RC_UNAME" = "FreeBSD" ]; then
|
||||
sysctl hw.bus.devctl_disable=1 >/dev/null
|
||||
fi
|
||||
|
||||
. "$RC_LIBEXECDIR"/sh/init-common-post.sh
|
||||
# mount $RC_SVCDIR as something we can write to if it's not rw
|
||||
# On vservers, / is always rw at this point, so we need to clean out
|
||||
# the old service state data
|
||||
: ${RC_LIBEXECDIR:=@LIBEXECDIR@}
|
||||
: ${RC_SVCDIR:=@LIBEXECDIR@/init.d}
|
||||
case "$(openrc --sys)" in
|
||||
OPENVZ|VSERVER) rm -rf "$RC_SVCDIR"/*;;
|
||||
*) if mountinfo --quiet "$RC_SVCDIR"; then
|
||||
rm -rf "$RC_SVCDIR"/*
|
||||
else
|
||||
mount_svcdir
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
retval=$?
|
||||
|
||||
if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then
|
||||
cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null
|
||||
fi
|
||||
|
||||
echo sysinit >"$RC_SVCDIR"/softlevel
|
||||
exit $retval
|
||||
|
Loading…
Reference in New Issue
Block a user