diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-12-20 22:06:21 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-12-20 22:06:21 +0000 |
| commit | 8a7553abb47f11dfcb3addf8adb94bcb89c8aa6c (patch) | |
| tree | c65661e693fe112424a7d9736467ca721e9f692e /etc | |
| parent | 656a2feab27346b251e20767260d98b86e1691b1 (diff) | |
| download | pfsense-8a7553abb47f11dfcb3addf8adb94bcb89c8aa6c.zip pfsense-8a7553abb47f11dfcb3addf8adb94bcb89c8aa6c.tar.gz | |
Switch to ISC-Dhclient. OpenBSD's dhclient is driving me bonkers.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/devd.conf | 12 | ||||
| -rw-r--r-- | etc/inc/interfaces.inc | 10 |
2 files changed, 5 insertions, 17 deletions
diff --git a/etc/devd.conf b/etc/devd.conf index 847f6f5..d4ae827 100644 --- a/etc/devd.conf +++ b/etc/devd.conf @@ -11,18 +11,6 @@ options { [0-9]+"; }; -# Handle ethernet linkup and linkdown -notify 0 { - match "type" "LINK_UP"; - media-type "ethernet"; - action "/bin/echo -n '$subsystem start ' >>/tmp/rc.linkup"; -}; -notify 0 { - match "type" "LINK_DOWN"; - media-type "ethernet"; - action "/bin/echo -n '$subsystem stop ' >>/tmp/rc.linkup"; -}; - # When a USB keyboard arrives, attach it as the console keyboard. attach 100 { device-name "ukbd0"; diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index cf8b7c9..f2a2db5 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -970,7 +970,7 @@ EOD; mwexec("/sbin/ifconfig {$optif} up"); /* fire up dhclient */ - mwexec("/sbin/dhclient -c {$g['varetc_path']}/dhclient_{$optif}.conf {$optif}"); + mwexec("/sbin/dhclient -cf {$g['varetc_path']}/dhclient_{$optif}.conf {$optif}"); return 0; } @@ -1016,10 +1016,10 @@ EOD; mwexec("/sbin/ifconfig {$optif} up"); /* fire up dhclient */ - mwexec("/sbin/dhclient -c {$g['varetc_path']}/dhclient_{$optif}.conf {$optif} >/tmp/{$optif}_output >/tmp/{$optif}_error_output"); + mwexec("/sbin/dhclient -cf {$g['varetc_path']}/dhclient_{$optif}.conf {$optif} >/tmp/{$optif}_output 2>/tmp/{$optif}_error_output"); $fout = fopen("/tmp/ifconfig_{$optif}","w"); - fwrite($fout, "/sbin/dhclient -c {$g['varetc_path']}/dhclient_{$optif}.conf {$optif}"); + fwrite($fout, "/sbin/dhclient -cf {$g['varetc_path']}/dhclient_{$optif}.conf {$optif}"); fclose($fout); return 0; @@ -1063,10 +1063,10 @@ EOD; mwexec("/sbin/ifconfig {$wanif} up"); /* fire up dhclient */ - mwexec("/sbin/dhclient -c {$g['varetc_path']}/dhclient_wan.conf {$wanif} >/tmp/{$wanif}_output >/tmp/{$wanif}_error_output"); + mwexec("/sbin/dhclient -cf {$g['varetc_path']}/dhclient_wan.conf {$wanif} >/tmp/{$wanif}_output 2>/tmp/{$wanif}_error_output"); $fout = fopen("/tmp/ifconfig_{$wanif}","w"); - fwrite($fout, "/sbin/dhclient -c {$g['varetc_path']}/dhclient_wan.conf {$wanif}"); + fwrite($fout, "/sbin/dhclient -cf {$g['varetc_path']}/dhclient_wan.conf {$wanif}"); fclose($fout); return 0; |
