summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-12-13 09:25:37 +0100
committerGitHub <noreply@github.com>2019-12-13 09:25:37 +0100
commitd814020778b8310faa3cd57ccfbc718bfb2fe215 (patch)
treef27684afe97b6a1edb90484e1c014e996c8edd41
parent9dc0d74098f98d2917a85959acd4915fe7a4ffe1 (diff)
parent8a28567736dfaffd4b827f1b8b769814474d73ba (diff)
downloadvyos-1x-d814020778b8310faa3cd57ccfbc718bfb2fe215.tar.gz
vyos-1x-d814020778b8310faa3cd57ccfbc718bfb2fe215.zip
Merge pull request #182 from jjakob/equuleus
-rwxr-xr-xsrc/conf_mode/dhcp_server.py13
-rwxr-xr-xsrc/conf_mode/dhcpv6_server.py9
-rwxr-xr-xsrc/etc/init.d/isc-dhcpv4-server113
-rwxr-xr-xsrc/etc/init.d/isc-dhcpv6-server14
-rwxr-xr-xsrc/op_mode/show_dhcp.py4
-rwxr-xr-xsrc/op_mode/show_dhcpv6.py2
6 files changed, 135 insertions, 20 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py
index c2a188812..bf86e484b 100755
--- a/src/conf_mode/dhcp_server.py
+++ b/src/conf_mode/dhcp_server.py
@@ -28,7 +28,8 @@ from vyos import ConfigError
config_file = r'/etc/dhcp/dhcpd.conf'
lease_file = r'/config/dhcpd.leases'
-daemon_config_file = r'/etc/default/isc-dhcp-server'
+pid_file = r'/var/run/dhcpd.pid'
+daemon_config_file = r'/etc/default/isc-dhcpv4-server'
# Please be careful if you edit the template.
config_tmpl = """
@@ -231,10 +232,10 @@ shared-network {{ network.name }} {
daemon_tmpl = """
### Autogenerated by dhcp_server.py ###
-# sourced by /etc/init.d/isc-dhcp-server
+# sourced by /etc/init.d/isc-dhcpv4-server
-DHCPD_CONF=/etc/dhcp/dhcpd.conf
-DHCPD_PID=/var/run/dhcpd.pid
+DHCPD_CONF={{ config_file }}
+DHCPD_PID={{ pid_file }}
OPTIONS="-4 -lf {{ lease_file }}"
INTERFACES=""
"""
@@ -827,7 +828,7 @@ def generate(dhcp):
def apply(dhcp):
if (dhcp is None) or dhcp['disabled']:
# DHCP server is removed in the commit
- os.system('sudo systemctl stop isc-dhcp-server.service')
+ os.system('sudo systemctl stop isc-dhcpv4-server.service')
if os.path.exists(config_file):
os.unlink(config_file)
if os.path.exists(daemon_config_file):
@@ -837,7 +838,7 @@ def apply(dhcp):
if not os.path.exists(lease_file):
os.mknod(lease_file)
- os.system('sudo systemctl restart isc-dhcp-server.service')
+ os.system('sudo systemctl restart isc-dhcpv4-server.service')
return None
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index 039321430..44a927789 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.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
@@ -29,6 +29,7 @@ from vyos import ConfigError
config_file = r'/etc/dhcp/dhcpdv6.conf'
lease_file = r'/config/dhcpdv6.leases'
+pid_file = r'/var/run/dhcpdv6.pid'
daemon_config_file = r'/etc/default/isc-dhcpv6-server'
# Please be careful if you edit the template.
@@ -115,12 +116,12 @@ shared-network {{ network.name }} {
"""
daemon_tmpl = """
-### Autogenerated by dhcp_server.py ###
+### Autogenerated by dhcpv6_server.py ###
# sourced by /etc/init.d/isc-dhcpv6-server
-DHCPD_CONF=/etc/dhcp/dhcpdv6.conf
-DHCPD_PID=/var/run/dhcpdv6.pid
+DHCPD_CONF={{ config_file }}
+DHCPD_PID={{ pid_file }}
OPTIONS="-6 -lf {{ lease_file }}"
INTERFACES=""
"""
diff --git a/src/etc/init.d/isc-dhcpv4-server b/src/etc/init.d/isc-dhcpv4-server
new file mode 100755
index 000000000..377634a13
--- /dev/null
+++ b/src/etc/init.d/isc-dhcpv4-server
@@ -0,0 +1,113 @@
+#!/bin/sh
+#
+#
+
+### BEGIN INIT INFO
+# Provides: isc-dhcpv4-server
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $network $syslog
+# Should-Start: $local_fs slapd $named
+# Should-Stop: $local_fs slapd
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: IPv4 DHCP server
+# Description: Dynamic Host Configuration Protocol Server for IPv4
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+test -f /usr/sbin/dhcpd || exit 0
+
+DHCPD_DEFAULT="${DHCPD_DEFAULT:-/etc/default/isc-dhcpv4-server}"
+
+# It is not safe to start if we don't have a default configuration...
+if [ ! -f "$DHCPD_DEFAULT" ]; then
+ echo "$DHCPD_DEFAULT does not exist! - Aborting..."
+ exit 0
+fi
+
+. /lib/lsb/init-functions
+
+# Read init script configuration
+[ -f "$DHCPD_DEFAULT" ] && . "$DHCPD_DEFAULT"
+
+NAME=dhcpd
+DESC="ISC DHCP server"
+# fallback to default config file
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
+# try to read pid file name from config file, with fallback to /var/run/dhcpd.pid
+if [ -z "$DHCPD_PID" ]; then
+ DHCPD_PID=$(sed -n -e 's/^[ \t]*pid-file-name[ \t]*"(.*)"[ \t]*;.*$/\1/p' < "$DHCPD_CONF" 2>/dev/null | head -n 1)
+fi
+DHCPD_PID="${DHCPD_PID:-/var/run/dhcpd.pid}"
+
+test_config()
+{
+ if ! /usr/sbin/dhcpd -t $OPTIONS -q -cf "$DHCPD_CONF" > /dev/null 2>&1; then
+ echo "dhcpd self-test failed. Please fix $DHCPD_CONF."
+ echo "The error was: "
+ /usr/sbin/dhcpd -t $OPTIONS -cf "$DHCPD_CONF"
+ exit 1
+ fi
+ touch /var/lib/dhcp/dhcpd.leases
+}
+
+# single arg is -v for messages, -q for none
+check_status()
+{
+ if [ ! -r "$DHCPD_PID" ]; then
+ test "$1" != -v || echo "$NAME is not running."
+ return 3
+ fi
+ if read pid < "$DHCPD_PID" && ps -p "$pid" > /dev/null 2>&1; then
+ test "$1" != -v || echo "$NAME is running."
+ return 0
+ else
+ test "$1" != -v || echo "$NAME is not running but $DHCPD_PID exists."
+ return 1
+ fi
+}
+
+case "$1" in
+ start)
+ test_config
+ log_daemon_msg "Starting $DESC" "$NAME"
+ start-stop-daemon --start --quiet --pidfile "$DHCPD_PID" \
+ --exec /usr/sbin/dhcpd -- \
+ -q $OPTIONS -cf "$DHCPD_CONF" -pf "$DHCPD_PID" $INTERFACES
+ sleep 2
+
+ if check_status -q; then
+ log_end_msg 0
+ else
+ log_failure_msg "check syslog for diagnostics."
+ log_end_msg 1
+ exit 1
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --stop --quiet --pidfile "$DHCPD_PID"
+ log_end_msg $?
+ rm -f "$DHCPD_PID"
+ ;;
+ restart | force-reload)
+ test_config
+ $0 stop
+ sleep 2
+ $0 start
+ if [ "$?" != "0" ]; then
+ exit 1
+ fi
+ ;;
+ status)
+ echo -n "Status of $DESC: "
+ check_status -v
+ exit "$?"
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload|status}"
+ exit 1
+esac
+
+exit 0
diff --git a/src/etc/init.d/isc-dhcpv6-server b/src/etc/init.d/isc-dhcpv6-server
index 441827d5f..55f59b68e 100755
--- a/src/etc/init.d/isc-dhcpv6-server
+++ b/src/etc/init.d/isc-dhcpv6-server
@@ -31,15 +31,15 @@ fi
# Read init script configuration
[ -f "$DHCPD_DEFAULT" ] && . "$DHCPD_DEFAULT"
-NAME=dhcpd
-DESC="ISC DHCP server"
+NAME=dhcpdv6
+DESC="ISC DHCP server IPv6"
# fallback to default config file
-DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
-# try to read pid file name from config file, with fallback to /var/run/dhcpd.pid
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpdv6.conf}
+# try to read pid file name from config file, with fallback to /var/run/dhcpdv6.pid
if [ -z "$DHCPD_PID" ]; then
DHCPD_PID=$(sed -n -e 's/^[ \t]*pid-file-name[ \t]*"(.*)"[ \t]*;.*$/\1/p' < "$DHCPD_CONF" 2>/dev/null | head -n 1)
fi
-DHCPD_PID="${DHCPD_PID:-/var/run/dhcpd.pid}"
+DHCPD_PID="${DHCPD_PID:-/var/run/dhcpdv6.pid}"
test_config()
{
@@ -49,7 +49,7 @@ test_config()
/usr/sbin/dhcpd -t $OPTIONS -cf "$DHCPD_CONF"
exit 1
fi
- touch /var/lib/dhcp/dhcpd.leases
+ touch /var/lib/dhcp/dhcpdv6.leases
}
# single arg is -v for messages, -q for none
@@ -107,7 +107,7 @@ case "$1" in
;;
*)
echo "Usage: $0 {start|stop|restart|force-reload|status}"
- exit 1
+ exit 1
esac
exit 0
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:
diff --git a/src/op_mode/show_dhcpv6.py b/src/op_mode/show_dhcpv6.py
index 1a6ee62e6..ae63af39b 100755
--- a/src/op_mode/show_dhcpv6.py
+++ b/src/op_mode/show_dhcpv6.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