diff options
| author | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-05-23 20:38:12 +0100 |
| commit | c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc (patch) | |
| tree | fe1f406f976dbcec3d7225ccf1b0f08f6957dfcc /net | |
| parent | 5294abe6171610a1aa0eb093774bed9bb965c9cf (diff) | |
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.
Diffstat (limited to 'net')
| -rw-r--r-- | net/Makefile | 2 | ||||
| -rw-r--r-- | net/ifwatchd.sh | 12 | ||||
| -rw-r--r-- | net/udhcpc.sh | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/net/Makefile b/net/Makefile index bde659e1..5cba7eb0 100644 --- a/net/Makefile +++ b/net/Makefile @@ -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 diff --git a/net/ifwatchd.sh b/net/ifwatchd.sh index e8c5e2bc..d9da15eb 100644 --- a/net/ifwatchd.sh +++ b/net/ifwatchd.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 $? } diff --git a/net/udhcpc.sh b/net/udhcpc.sh index 7efdf429..75cbf093 100644 --- a/net/udhcpc.sh +++ b/net/udhcpc.sh @@ -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 \ |