diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-04-07 12:09:33 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-04-07 12:09:33 +0000 |
| commit | 5248512a484594efe0b1d45e1c3b2bd6bd3a27cd (patch) | |
| tree | 650e9d7283617fc3b34a1d6bb9ebd26aa4c413df /net-scripts/net.modules.d/dhcpcd.sh | |
| parent | Merging r1959 (diff) | |
| download | baselayout-vserver-5248512a484594efe0b1d45e1c3b2bd6bd3a27cd.tar.gz baselayout-vserver-5248512a484594efe0b1d45e1c3b2bd6bd3a27cd.tar.bz2 baselayout-vserver-5248512a484594efe0b1d45e1c3b2bd6bd3a27cd.zip | |
Merging net-scripts changes; fixing ChangeLog's
svn path=/baselayout-vserver/trunk/; revision=314
Diffstat (limited to 'net-scripts/net.modules.d/dhcpcd.sh')
| -rw-r--r-- | net-scripts/net.modules.d/dhcpcd.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net-scripts/net.modules.d/dhcpcd.sh b/net-scripts/net.modules.d/dhcpcd.sh index 516f7e3..2311386 100644 --- a/net-scripts/net.modules.d/dhcpcd.sh +++ b/net-scripts/net.modules.d/dhcpcd.sh @@ -59,7 +59,7 @@ dhcpcd_stop() { else start-stop-daemon --stop --exec /sbin/dhcpcd --pidfile "${pidfile}" fi - eend $? "timed out" + eend $? } # bool dhcpcd_start(char *iface) @@ -100,16 +100,9 @@ dhcpcd_start() { metric="metric_${ifvar}" [[ -n ${!metric} && ${!metric} != "0" ]] && opts="${opts} -m ${!metric}" - # Instruct dhcpcd to use our wrapper - opts="${opts} -c \"${svclib}/net.modules.d/helpers.d/dhcpcd-wrapper\"" - - # Instruct dhcpcd to create it's files in our state dir - opts="${opts} -e \"${statedir}/${iface}\"" - # Bring up DHCP for this interface (or alias) ebegin "Running dhcpcd" - [[ ! -d "${statedir}/${iface}" ]] && mkdir -m 0755 -p "${statedir}/${iface}" eval /sbin/dhcpcd "${opts}" "${iface}" eend $? || return 1 @@ -120,4 +113,4 @@ dhcpcd_start() { return 0 } -# vim: set ft=sh ts=4 : +# vim: set ts=4 : |