diff options
| author | Roy Marples <roy@marples.name> | 2009-05-29 14:15:12 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-05-29 14:15:12 +0100 |
| commit | 83e82c452e89bf27de2a7b01bc2356c9050b2a18 (patch) | |
| tree | a4f8843c7c02a6b51abb06a16f0a9a6665facc71 /net | |
| parent | 9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff) | |
| parent | a518d34549fd80268e9c70d2300808b63c54825c (diff) | |
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
Diffstat (limited to 'net')
| -rw-r--r-- | net/.gitignore | 2 | ||||
| -rw-r--r-- | net/Makefile | 2 | ||||
| -rw-r--r-- | net/ifwatchd.sh | 12 | ||||
| -rw-r--r-- | net/udhcpc.sh | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/net/.gitignore b/net/.gitignore new file mode 100644 index 00000000..57c5832e --- /dev/null +++ b/net/.gitignore @@ -0,0 +1,2 @@ +ifconfig.sh +iwconfig.sh 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 \ |