Move non compiled libraries from /lib/rc to /libexec/rc
OpenRC version is now stored as plaintext in /libexec/rc/version Plugins (cursplash, splashutils) will have to be re-compiled to pickup the new directories. State data needs to be moved from /lib/rc/init.d to /libexec/rc/init.d as well.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
DIR= ${PREFIX}/${RC_LIB}/net
|
||||
DIR= ${LIBEXECDIR}/net
|
||||
SRCS= ifconfig.sh.in
|
||||
INC= dhclient.sh dhcpcd.sh ifconfig.sh macchanger.sh macnet.sh \
|
||||
ssidnet.sh system.sh wpa_supplicant.sh
|
||||
|
@@ -33,8 +33,8 @@ ifwatchd_pre_start()
|
||||
# Start ifwatchd
|
||||
export IN_BACKGROUND=yes
|
||||
start-stop-daemon --start --exec /usr/sbin/ifwatchd \
|
||||
-- -c "${RC_LIBDIR}/sh/ifwatchd-carrier.sh" \
|
||||
-n "${RC_LIBDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}"
|
||||
-- -c "${RC_LIBEXECDIR}/sh/ifwatchd-carrier.sh" \
|
||||
-n "${RC_LIBEXECDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}"
|
||||
unset IN_BACKGROUND
|
||||
eend "$?" || return 1
|
||||
|
||||
@@ -47,13 +47,13 @@ ifwatchd_stop()
|
||||
yesno ${IN_BACKGROUND} && return 0
|
||||
|
||||
start-stop-daemon --test --quiet --stop --exec /usr/sbin/ifwatchd \
|
||||
-- -c "${RC_LIBDIR}/sh/ifwatchd-carrier.sh" \
|
||||
-n "${RC_LIBDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}" \
|
||||
-- -c "${RC_LIBEXECDIR}/sh/ifwatchd-carrier.sh" \
|
||||
-n "${RC_LIBEXECDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}" \
|
||||
|| return 0
|
||||
|
||||
ebegin "Stopping ifwatchd on" "${IFACE}"
|
||||
start-stop-daemon --stop --exec /usr/sbin/ifwatchd \
|
||||
-- -c "${RC_LIBDIR}/sh/ifwatchd-carrier.sh" \
|
||||
-n "${RC_LIBDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}"
|
||||
-- -c "${RC_LIBEXECDIR}/sh/ifwatchd-carrier.sh" \
|
||||
-n "${RC_LIBEXECDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}"
|
||||
eend $?
|
||||
}
|
||||
|
@@ -68,7 +68,7 @@ udhcpc_start()
|
||||
;;
|
||||
esac
|
||||
|
||||
local script="${RC_LIBDIR}"/sh/udhcpc.sh
|
||||
local script="${RC_LIBEXECDIR}"/sh/udhcpc.h
|
||||
[ -x "${script}" ] || script=/lib/rcscripts/sh/udhcpc.sh
|
||||
|
||||
eval "${x}" "${args}" --interface="${IFACE}" --now \
|
||||
|
Reference in New Issue
Block a user