diff options
| author | Michael Biebl <biebl@debian.org> | 2019-12-26 06:54:20 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-12-26 06:54:36 +0100 |
| commit | 69d25f00e8f6ea8e6d2b864c229d834f2f2a9bf7 (patch) | |
| tree | 1540d17b5db66aa6710ab987e42ee4c7e3e3ba46 | |
| parent | 2a2c31d1bb1ee4a37e79774e41b527729f38a3c9 (diff) | |
Rebase patches
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 2 | ||||
| -rw-r--r-- | debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch | 32 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 34 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 07322947..40c5217a 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 132cf5a..e08badd 100644 +index 3696c78..abd71c4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -50,6 +50,8 @@ diff --git a/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch b/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch deleted file mode 100644 index a361aa31..00000000 --- a/debian/patches/dhcp-nettools-fix-parsing-of-search-domains-option.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Tue, 17 Dec 2019 14:23:33 +0100 -Subject: dhcp: nettools: fix parsing of search domains option - -'first' was never modified and so the dot was never added. - -Fixes: 6adade6f21d5 ('dhcp: add nettools dhcp4 client') - -https://bugzilla.redhat.com/show_bug.cgi?id=1783981 -(cherry picked from commit 9aa00a8a14cb64f851234d025498ff2f9ec18e94) -(cherry picked from commit ea22135384edaf57a41293bd517ff1445b8c88a8) ---- - src/dhcp/nm-dhcp-nettools.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c -index e557c00..a537ee8 100644 ---- a/src/dhcp/nm-dhcp-nettools.c -+++ b/src/dhcp/nm-dhcp-nettools.c -@@ -246,10 +246,10 @@ lease_option_print_domain_name (GString *str, uint8_t *cache, size_t *n_cachep, - return TRUE; - } - -- if (!first) { -+ if (!first) - g_string_append_c(str, '.'); -+ else - first = FALSE; -- } - - if (!lease_option_print_label (str, n_label, domainp, n_domainp)) - return FALSE; diff --git a/debian/patches/series b/debian/patches/series index f14d66cb..9a20acf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch -dhcp-nettools-fix-parsing-of-search-domains-option.patch |