Merge branch 'equuleus' of github.com:vyos/vyos-1x into currentvyos/1.3dev0

* 'equuleus' of github.com:vyos/vyos-1x:
  T1873: DHCP: add current year to copyright notice
  T1873: DHCP: fix service name in op-mode "show dhcp"
  T1873: DHCP: ship our own server init scripts
  vyos.config: T1862: restore regex after merge
  equuleus: T1862: Use regex pattern \s+ to split strings on whitespace
  [vyos.config] T1758: adjust regex for change in Python 3.7
  Jenkins: Docker: always pull container from Dockerhub
  ssh - T1719: ssh deprecated options removed
  Jenkins: assume dependencies are available in Docker container
  Jenkins: fix httpURI in isCustomBuild()
  openvpn: T1617: bugfix for server push-route
  openvpn: T1548: remove authy 2fa provider
  update Jenkins file for equuleus
  igmpproxy: remove init script which is already provided by Debian Buster

1 files changed, 2 insertions, 2 deletions

diff --git a/src/op_mode/show_dhcp.py b/src/op_mode/show_dhcp.py
index c2a05f516..f801ba753 100755
--- a/src/op_mode/show_dhcp.py
+++ b/src/op_mode/show_dhcp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2019 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -190,7 +190,7 @@ if __name__ == '__main__':
         sys.exit(0)
 
     # if dhcp server is down, inactive leases may still be shown as active, so warn the user.
-    if os.system('systemctl -q is-active isc-dhcp-server.service') != 0:
+    if os.system('systemctl -q is-active isc-dhcpv4-server.service') != 0:
         print("WARNING: DHCP server is configured but not started. Data may be stale.")
 
     if args.leases: