← Back to team overview

netplan-developers team mailing list archive

Re: [Merge] ~morphis/netplan/+git/netplan:nm-snap-support into netplan:master

 


Diff comments:

> diff --git a/src/netplan b/src/netplan
> index bdef802..40663c8 100755
> --- a/src/netplan
> +++ b/src/netplan
> @@ -258,8 +285,12 @@ def command_apply():  # pragma: nocover (covered in autopkgtest)
>              # restarting NM does not cause new config to be applied, need to shut down devices first
>              for device in devices:
>                  # ignore failures here -- some/many devices might not be managed by NM
> -                subprocess.call(['nmcli', 'device', 'disconnect', device], stderr=subprocess.DEVNULL)
> -            subprocess.check_call(['systemctl', 'stop', '--no-block', 'NetworkManager.service'])
> +                try:
> +                    nmcli(['device', 'disconnect', device])
> +                except CalledProcessError:

Not sure why this doesn't appear here but the actual commit in the branch has that change.

> +                    pass
> +
> +            systemctl_network_manager('stop')
>      else:
>          logging.debug('no netplan generated NM configuration exists')
>  


-- 
https://code.launchpad.net/~morphis/netplan/+git/netplan/+merge/306607
Your team Developers of netplan is subscribed to branch netplan:master.


References