Commit 7699be26 authored by Jouke Witteveen's avatar Jouke Witteveen
Browse files

Unhardcode paths

Remove distribution-specific paths (and allow overrides).
parent 1d49567a
......@@ -16,6 +16,7 @@ optdepends=('dialog: for the menu based wifi assistant'
'wpa_actiond: for automatic wireless connections through netctl-auto'
'ifenslave: for bond connections'
'bridge-utils: for bridge connections'
'ppp: for pppoe connections'
)
conflicts=("netcfg")
source=(ftp://ftp.archlinux.org/other/packages/netctl/netctl-${pkgver}.tar.xz{,.sig})
......
......@@ -2,7 +2,7 @@
. "$SUBR_DIR/ip"
IFENSLAVE="/sbin/ifenslave"
: ${IFENSLAVE:=ifenslave}
bond_up() {
if is_interface "$Interface"; then
......
......@@ -2,7 +2,7 @@
. "$SUBR_DIR/ip"
BRCTL="/usr/sbin/brctl"
: ${BRCTL:=brctl}
bridge_up() {
if is_interface "$Interface"; then
......
# Contributed by: Thomas Bächler <thomas@archlinux.org>
: ${PPPD:=pppd}
_quotestring() {
echo "\"${1/\"/\\\"}\""
}
......@@ -43,8 +45,8 @@ pppoe_up() {
[[ -n ${PPPoEMAC} ]] && echo "pppoe-mac $(_quotestring "${PPPoEMAC}")" >> "${cfg}"
[[ ${PPPoEIP6} == yes ]] && echo "+ipv6" >> "${cfg}"
/sbin/ip link set dev "${Interface}" up
/usr/sbin/pppd file "${cfg}"
ip link set dev "${Interface}" up
$PPPD file "${cfg}"
if [[ $? -ne 0 ]]; then
rm "${cfg}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment