Merge ~vorlon/ubuntu/+source/ifupdown:ubuntu/devel into ubuntu/+source/ifupdown:ubuntu/devel

Proposed by Steve Langasek
Status: Needs review
Proposed branch: ~vorlon/ubuntu/+source/ifupdown:ubuntu/devel
Merge into: ubuntu/+source/ifupdown:ubuntu/devel
Diff against target: 202 lines (+153/-1)
6 files modified
debian/changelog (+18/-0)
debian/control (+1/-1)
debian/ifupdown.dhclient-enter-hook (+20/-0)
debian/ifupdown.dhclient-exit-hook (+110/-0)
debian/ifupdown.maintscript (+1/-0)
debian/install (+3/-0)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) code-review Approve
Review via email: mp+382729@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

We will also need a corresponding upload of resolvconf, and we will also need to SRU systemd asap to remove its dhclient hook from the package, then add appropriate breaks in various places.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

code-review is good. Some minor comments.

will proceed to test builds & interactive testing.

review: Approve (code-review)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Do we need any breaks/reaplaces on systemd? or like just drop conffile in systemd too?

Revision history for this message
Steve Langasek (vorlon) wrote :

On Thu, Apr 23, 2020 at 02:11:15PM -0000, Dimitri John Ledkov wrote:

> Do we need any breaks/reaplaces on systemd? or like just drop conffile in
> systemd too?

Yes we should, but we don't know the versions to use in the field until
systemd is uploaded.

>
> Diff comments:
>
> > diff --git a/debian/ifupdown.maintscript b/debian/ifupdown.maintscript
> > index 2203f84..11fd04c 100644
> > --- a/debian/ifupdown.maintscript
> > +++ b/debian/ifupdown.maintscript
> > @@ -7,3 +7,4 @@ rm_conffile /etc/init/network-interface-security.conf 0.8.25~ ifupdown
> > rm_conffile /etc/init/network-interface.conf 0.8.25~ ifupdown
> > rm_conffile /etc/network/if-up.d/upstart 0.8.29~ ifupdown
> > rm_conffile /etc/network/if-down.d/upstart 0.8.29~ ifupdown
> > +rm_conffile /etc/dhcp/dhclient-enter-hooks.d/resolved 0.8.35ubuntu2 systemd

> Given we do this, we need to also want systemd upload to remove the
> conffile there too, right?

Yes, definitely (and that determines what versions should be in the Breaks
field).

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches