diff options
| author | Frederik "Freso" S. Olesen | 2014-12-16 22:21:33 +0100 |
|---|---|---|
| committer | Frederik “Freso” S. Olesen | 2015-07-12 15:28:57 +0200 |
| commit | 1ee63aa342421dbe0097314a5937139ed7936a11 (patch) | |
| tree | 55bec8eabc1db4ca194905d7d51905ac5cbd77e3 | |
| parent | 9879082597c7930f2d259975c8f796d45ad15833 (diff) | |
| parent | 2e149b3eb682556bedd98134d81e4bfdb14c9e21 (diff) | |
| download | aur-1ee63aa342421dbe0097314a5937139ed7936a11.tar.gz | |
Merge remote-tracking branch 'bitbucket-cgtx/master' into networkmanager-dispatcher-chrony-update
Conflicts:
networkmanager-dispatcher-chrony/10-chrony
| -rw-r--r-- | 10-chrony | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/10-chrony b/10-chrony index 81024f5e1713..8931ac161824 100644 --- a/10-chrony +++ b/10-chrony @@ -6,15 +6,17 @@ STATUS=$2 # Make sure we're always getting the standard response strings LANG='C' -# Chrony set-up CHRONY=/usr/bin/chronyc -STATECMD='nmcli -t --fields STATE g' chrony_cmd() { echo Chrony going $1. exec $CHRONY -a $1 } +nm_connected() { + [ "$(nmcli -t --fields STATE g)" == "connected" ]; +} + case "$STATUS" in up) chrony_cmd online @@ -24,14 +26,10 @@ case "$STATUS" in ;; down) # Check for active interface, take offline if none is active - if [ ! `${STATECMD}` = 'connected' ]; then - chrony_cmd offline - fi + nm_connected || chrony_cmd offline ;; vpn-down) # Check for active interface, take offline if none is active - if [ ! `${STATECMD}` = 'connected' ]; then - chrony_cmd offline - fi + nm_connected || chrony_cmd offline ;; esac |