Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 15 Aug 2017 14:56:56 +0800 |
| 4 | Subject: [PATCH 02/11] dhclient dbus |
| 5 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 6 | Upstream-Status: Inappropriate [distribution] |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 7 | |
| 8 | Rebase to 4.3.6 |
| 9 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 10 | --- |
| 11 | client/scripts/bsdos | 5 +++++ |
| 12 | client/scripts/freebsd | 5 +++++ |
| 13 | client/scripts/linux | 5 +++++ |
| 14 | client/scripts/netbsd | 5 +++++ |
| 15 | client/scripts/openbsd | 5 +++++ |
| 16 | client/scripts/solaris | 5 +++++ |
| 17 | 6 files changed, 30 insertions(+) |
| 18 | |
| 19 | diff --git a/client/scripts/bsdos b/client/scripts/bsdos |
| 20 | index d69d0d8..095b143 100755 |
| 21 | --- a/client/scripts/bsdos |
| 22 | +++ b/client/scripts/bsdos |
| 23 | @@ -45,6 +45,11 @@ exit_with_hooks() { |
| 24 | . /etc/dhclient-exit-hooks |
| 25 | fi |
| 26 | # probably should do something with exit status of the local script |
| 27 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then |
| 28 | + dbus-send --system --dest=com.redhat.dhcp \ |
| 29 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ |
| 30 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" |
| 31 | + fi |
| 32 | exit $exit_status |
| 33 | } |
| 34 | |
| 35 | diff --git a/client/scripts/freebsd b/client/scripts/freebsd |
| 36 | index 8f3e2a2..ad7fb44 100755 |
| 37 | --- a/client/scripts/freebsd |
| 38 | +++ b/client/scripts/freebsd |
| 39 | @@ -89,6 +89,11 @@ exit_with_hooks() { |
| 40 | . /etc/dhclient-exit-hooks |
| 41 | fi |
| 42 | # probably should do something with exit status of the local script |
| 43 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then |
| 44 | + dbus-send --system --dest=com.redhat.dhcp \ |
| 45 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ |
| 46 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" |
| 47 | + fi |
| 48 | exit $exit_status |
| 49 | } |
| 50 | |
| 51 | diff --git a/client/scripts/linux b/client/scripts/linux |
| 52 | index 5fb1612..3d447b6 100755 |
| 53 | --- a/client/scripts/linux |
| 54 | +++ b/client/scripts/linux |
| 55 | @@ -174,6 +174,11 @@ exit_with_hooks() { |
| 56 | exit_status=$? |
| 57 | fi |
| 58 | |
| 59 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then |
| 60 | + dbus-send --system --dest=com.redhat.dhcp \ |
| 61 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ |
| 62 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" |
| 63 | + fi |
| 64 | exit $exit_status |
| 65 | } |
| 66 | |
| 67 | diff --git a/client/scripts/netbsd b/client/scripts/netbsd |
| 68 | index 07383b7..aaba8e8 100755 |
| 69 | --- a/client/scripts/netbsd |
| 70 | +++ b/client/scripts/netbsd |
| 71 | @@ -45,6 +45,11 @@ exit_with_hooks() { |
| 72 | . /etc/dhclient-exit-hooks |
| 73 | fi |
| 74 | # probably should do something with exit status of the local script |
| 75 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then |
| 76 | + dbus-send --system --dest=com.redhat.dhcp \ |
| 77 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ |
| 78 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" |
| 79 | + fi |
| 80 | exit $exit_status |
| 81 | } |
| 82 | |
| 83 | diff --git a/client/scripts/openbsd b/client/scripts/openbsd |
| 84 | index e7f4746..56b980c 100644 |
| 85 | --- a/client/scripts/openbsd |
| 86 | +++ b/client/scripts/openbsd |
| 87 | @@ -45,6 +45,11 @@ exit_with_hooks() { |
| 88 | . /etc/dhclient-exit-hooks |
| 89 | fi |
| 90 | # probably should do something with exit status of the local script |
| 91 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then |
| 92 | + dbus-send --system --dest=com.redhat.dhcp \ |
| 93 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ |
| 94 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" |
| 95 | + fi |
| 96 | exit $exit_status |
| 97 | } |
| 98 | |
| 99 | diff --git a/client/scripts/solaris b/client/scripts/solaris |
| 100 | index af553b9..4a2aa69 100755 |
| 101 | --- a/client/scripts/solaris |
| 102 | +++ b/client/scripts/solaris |
| 103 | @@ -26,6 +26,11 @@ exit_with_hooks() { |
| 104 | . /etc/dhclient-exit-hooks |
| 105 | fi |
| 106 | # probably should do something with exit status of the local script |
| 107 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then |
| 108 | + dbus-send --system --dest=com.redhat.dhcp \ |
| 109 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ |
| 110 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" |
| 111 | + fi |
| 112 | exit $exit_status |
| 113 | } |
| 114 | |
| 115 | -- |
| 116 | 1.8.3.1 |
| 117 | |