diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-08-18 13:33:43 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-08-18 13:33:43 -0700 |
| commit | 14df7aa3c937ed8907bd7e9b2657526233691803 (patch) | |
| tree | 77e876ba2739e7fe396e93b8fd908df845d60d51 /lib/Vyatta/Misc.pm | |
| parent | abc2986d38f4b6f7a7ccc0fd3fb10e4f21652209 (diff) | |
| parent | 3594ffa9f1c62d5f73d12b35f81a862c762b5d44 (diff) | |
| download | vyatta-cfg-14df7aa3c937ed8907bd7e9b2657526233691803.tar.gz vyatta-cfg-14df7aa3c937ed8907bd7e9b2657526233691803.zip | |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg into mendocino
Diffstat (limited to 'lib/Vyatta/Misc.pm')
| -rwxr-xr-x | lib/Vyatta/Misc.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm index 44c0459..5373f7f 100755 --- a/lib/Vyatta/Misc.pm +++ b/lib/Vyatta/Misc.pm @@ -54,11 +54,11 @@ sub is_dhcp_enabled { return unless $intf; my $config = new Vyatta::Config; - $config->{_active_dir_base} = "/opt/vyatta/config/active/" - if ($outside_cli); $config->setLevel( $intf->path() ); - foreach my $addr ( $config->returnOrigPlusComValues('address') ) { + # the "effective" observers can be used both inside and outside + # config sessions. + foreach my $addr ( $config->returnEffectiveValues('address') ) { return 1 if ( $addr && $addr eq "dhcp" ); } |