~ubuntu-branches/ubuntu/saucy/ifupdown/saucy-proposed

Viewing all changes in revision 110.

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2013-08-26 16:56:45 UTC
  • mfrom: (107.1.3 saucy)
  • Revision ID: package-import@ubuntu.com-20130826165645-0ewzt2yfckue8phe
Tags: 0.7.44ubuntu1
* Merge from Debian. Remaining changes:
  - If the /etc/NetworkManager/NetworkManager.conf file is present
    but doesn't have the "ifupdown:managed" the previous upload instructed
    the iniparser to return -1, which evaluates to TRUE. We instead instruct
    it to return 0, as we shouldn't prevent ifupdown from managing the
    interfaces in that case, as NM won't either. (LP: #281984)
  - Remove /etc/default/networking as the upstart job doesn't use it and
    can't really use it without some significant changes (support exclusion
    lists in all the upstart jobs).
  - Add transition code for moving /etc/init.d/networking from netbase
    to ifupdown.
  - Make /etc/init.d/networking exit 1 immediately on Upstart system
    with an error message telling the user to use 'service'.
  - Always call dhclient with -1, Ubuntu carries a patch so that renewal
    won't time out.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: