diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:25:12 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:25:12 +0100 |
| commit | 75847af961fd61daa63b26e8bafb1237df85a7fb (patch) | |
| tree | 63deca295e8b843518cde30cadc2f1df15c6d273 /src/etc/init.d/isc-dhcpv6-server | |
| parent | 60e61ed1247c4f8efdd1805b1e1f2dda5ed2472c (diff) | |
| parent | 214e63fbad5f1ed008543ba0eec56d1aa6649745 (diff) | |
| download | vyos-1x-75847af961fd61daa63b26e8bafb1237df85a7fb.tar.gz vyos-1x-75847af961fd61daa63b26e8bafb1237df85a7fb.zip | |
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
Diffstat (limited to 'src/etc/init.d/isc-dhcpv6-server')
| -rwxr-xr-x | src/etc/init.d/isc-dhcpv6-server | 14 |
1 files changed, 7 insertions, 7 deletions
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 |