diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:35:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:49:48 +0100 |
| commit | 77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch) | |
| tree | 755536a0ed1fb36c2899e9bff9e092c4008a25c4 /debian/patches/ubuntu_revert_systemd.patch | |
| parent | 47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff) | |
| parent | fd80297a396cc4dd7da4da20208fb360aa369aa7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'debian/patches/ubuntu_revert_systemd.patch')
| -rw-r--r-- | debian/patches/ubuntu_revert_systemd.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/ubuntu_revert_systemd.patch b/debian/patches/ubuntu_revert_systemd.patch index e6482f5b..2f5740cd 100644 --- a/debian/patches/ubuntu_revert_systemd.patch +++ b/debian/patches/ubuntu_revert_systemd.patch @@ -1,8 +1,8 @@ -diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index b377c85e..ab4f8305 100644 ---- a/src/platform/nm-linux-platform.c -+++ b/src/platform/nm-linux-platform.c -@@ -26,7 +26,6 @@ +Index: network-manager/src/core/platform/nm-linux-platform.c +=================================================================== +--- network-manager.orig/src/core/platform/nm-linux-platform.c ++++ network-manager/src/core/platform/nm-linux-platform.c +@@ -29,7 +29,6 @@ #include <poll.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -10,7 +10,7 @@ index b377c85e..ab4f8305 100644 #include <unistd.h> #include "nm-std-aux/unaligned.h" -@@ -9528,34 +9527,12 @@ constructed(GObject *_object) +@@ -9515,34 +9514,12 @@ constructed(GObject *_object) } } |