lp:~tj/ubuntu/saucy/ifupdown/fixes-lp1235169

Created by TJ and last modified
Get this branch:
bzr branch lp:~tj/ubuntu/saucy/ifupdown/fixes-lp1235169
Only TJ can upload to this branch. If you are TJ please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
TJ
Status:
Development

Recent revisions

112. By TJ

Use 'include-dir' to successfully open interface definition file

111. By Steve Langasek

* On upgrade from 0.7.5ubuntu4, handle the fact that our unmodified conffile
  may have a mismatch in the dpkg database and manually shuffle the file
  around on upgrade. LP: #1217263.

[ Chris Arges ]
* Backport a fix from upstream mercurial
  (http://anonscm.debian.org/hg/collab-maint/ifupdown/rev/a93db3ecb8f0)
  for a race condition when updating the state file. LP: #1160490

110. By Stéphane Graber

* 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.

109. By Steve Langasek

releasing version 0.7.5ubuntu4

108. By Steve Langasek

Due to the checkered history of /etc/init.d/networking, only remove the
upstart-job symlink in the preinst if the dpkg status is 'newconffile',
to avoid bogus conffile prompts on upgrade, and manually manipulate the
new conffile into place in the postinst. LP: #1181856.

107. By Steve Langasek

releasing version 0.7.5ubuntu3

106. By Steve Langasek

Just call dh_installinit --noscripts and handle the preinst manually,
otherwise the postinst ends up with three calls to update-rc.d...

105. By Steve Langasek

Drop redundant debian/conffiles.

104. By Steve Langasek

If we're calling update-rc.d on install, we need to call it on purge too

103. By Steve Langasek

Explicitly invoke update-rc.d for networking in the postinst: we will
need this in the sequence in order to be able to use insserv later.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/saucy/ifupdown
This branch contains Public information 
Everyone can see this information.

Subscribers