diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-24 07:10:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 07:10:47 +0100 |
| commit | acb9815216dfe48c9d8684056381d9cd7b10fee0 (patch) | |
| tree | 9c011c37f08d2ed747b10ef90198103e07dd38da /python | |
| parent | 92e6efeec0e46570daacd5d96e754a3c89868e0b (diff) | |
| parent | 8f39784c847801c0b766a0c9289da0976ffd0604 (diff) | |
| download | vyos-1x-acb9815216dfe48c9d8684056381d9cd7b10fee0.tar.gz vyos-1x-acb9815216dfe48c9d8684056381d9cd7b10fee0.zip | |
Merge pull request #261 from thomas-mangin/2154
ethernet: T2154: do not report errors where none are
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/ifconfig/ethernet.py | 2 | ||||
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/python/vyos/ifconfig/ethernet.py b/python/vyos/ifconfig/ethernet.py index 8b6b6d9db..30e3a3bef 100644 --- a/python/vyos/ifconfig/ethernet.py +++ b/python/vyos/ifconfig/ethernet.py @@ -120,7 +120,7 @@ class EthernetIf(VLANIf): try: # An exception will be thrown if the settings are not changed return self._cmd(cmd) - except CalledProcessError: + except RuntimeError: pass def set_speed_duplex(self, speed, duplex): diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index 18256cf99..4f72271c9 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -680,8 +680,11 @@ class Interface(Control): with open(self._dhcp_cfg_file, 'w') as f: f.write(dhcp_text) - cmd = 'start-stop-daemon --start --quiet --pidfile ' + \ - self._dhcp_pid_file + cmd = 'start-stop-daemon' + cmd += ' --start ' + cmd += ' --quiet' + cmd += ' --oknodo' + cmd += ' --pidfile ' + self._dhcp_pid_file cmd += ' --exec /sbin/dhclient --' # now pass arguments to dhclient binary cmd += ' -4 -nw -cf {} -pf {} -lf {} {}'.format( @@ -765,8 +768,11 @@ class Interface(Control): .format(self.config['ifname']), 0) # assemble command-line to start DHCPv6 client (dhclient) - cmd = 'start-stop-daemon --start --quiet --pidfile ' + \ - self._dhcpv6_pid_file + cmd = 'start-stop-daemon' + cmd += ' --start ' + cmd += ' --quiet' + cmd += ' --oknodo' + cmd += ' --pidfile ' + self._dhcpv6_pid_file cmd += ' --exec /sbin/dhclient --' # now pass arguments to dhclient binary cmd += ' -6 -nw -cf {} -pf {} -lf {}'.format( @@ -802,7 +808,11 @@ class Interface(Control): return None # stop dhclient - cmd = 'start-stop-daemon --stop --quiet --pidfile {}'.format(self._dhcpv6_pid_file) + cmd = 'start-stop-daemon' + cmd += ' --stop' + cmd += ' --oknodo' + cmd += ' --quiet' + cmd += ' --pidfile ' + self._dhcpv6_pid_file self._cmd(cmd) # accept router announcements on this interface |