Ubuntu
systemd package

Merge ~fourdollars/ubuntu/+source/systemd:ubuntu-bionic into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-bionic

  1. Git
  2. lp:~fourdollars/ubuntu/+source/systemd
  3. ubuntu-bionic
  4. Merge into ubuntu-bionic
Proposed by Shih-Yuan Lee
Status: Merged
Merged at revision: 2357ccbc6857323d5a006e94465ce0987f1bb58d
Proposed branch: ~fourdollars/ubuntu/+source/systemd:ubuntu-bionic
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-bionic
Diff against target: 432 lines (+392/-0)
6 files modified
debian/changelog (+33/-0)
debian/patches/hwdb-revert-airplane-mode-keys-handling-on-Dell.patch (+33/-0)
debian/patches/lp1668771-resolved-switch-cache-option-to-a-tri-state-option-s.patch (+229/-0)
debian/patches/lp1833671-networkd-keep-bond-slave-up-if-already-attached.patch (+50/-0)
debian/patches/lp1835581-src-network-networkd-dhcp4.c-set-prefsrc-for-classle.patch (+43/-0)
debian/patches/series (+4/-0)
Reviewer Review Type Date Requested Status
Robert Ancell (community) Approve
Shih-Yuan Lee (community) Needs Resubmitting
Dimitri John Ledkov Pending
Review via email: mp+370808@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

The changelog mentions "drop Revert-udev-network-device-renaming-immediately-give.patch" but this patch still seems to be enabled.

The changelog should be updated to explicitly mention "d/p/hwdb-revert-airplane-mode-keys-handling-on-Dell.patch" as it's not clear that's what the line is referring to.

review: Needs Fixing
Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

Please help to review my patches again.

review: Needs Resubmitting
Revision history for this message
Robert Ancell (robert-ancell) wrote :

This still has the following line in the changelog:

[ You-Sheng Yang ]
* d/p/Revert-udev-network-device-renaming-immediately-give.patch:
  - udev: drop Revert-udev-network-device-renaming-immediately-give.patch
    The removing patch was for the already deprecated
    "75-persistent-net-generator.rules" based interface renaming mechanism,
    and it's causing unnecessary problem when a system happends to NICs with
    same MAC address, e.g. Dell's MAC address pass-thru. (LP: #1837700)

There is no Revert-udev-network-device-renaming-immediately-give.patch file in debian/patches/series. So this change doesn't seem to exist?

review: Needs Fixing
Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

This merge proposal is going to remove debian/patches/debian/Revert-udev-network-device-renaming-immediately-give.patch because it caused some regression so it is expected that you won't see it in debian/patches/series.

review: Needs Resubmitting
Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

I have revised the commit message and debian/changelog to the right path of d/p/d/Revert-udev-network-device-renaming-immediately-give.patch.

Revision history for this message
Robert Ancell (robert-ancell) wrote :

OK, I see the file now but it's still listed in debian/patches/series - so it's still being applied. Should that line be removed?

Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

Revert-udev-network-device-renaming-immediately-give.patch needs to be removed.

Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

Revert-udev-network-device-renaming-immediately-give.patch should not be listed in debian/patches/series.
https://git.launchpad.net/~fourdollars/ubuntu/+source/systemd/tree/debian/patches/series?h=ubuntu-bionic&id=2357ccbc6857323d5a006e94465ce0987f1bb58d doesn't contain Revert-udev-network-device-renaming-immediately-give.patch.

Revision history for this message
Robert Ancell (robert-ancell) wrote :

After much discussion on IRC @fourdollars showed me how the change is there in the merge commit, which you can see using gitk. It was added to the git repository after the 237-3ubuntu10.24 release, but the 237-3ubuntu10.25 release was made without this change.

review: Approve

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