summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/templates/dhcp-client/daemon-options.tmpl2
-rw-r--r--data/templates/dhcp-client/ipv6.tmpl2
-rw-r--r--python/vyos/ifconfig/dhcp.py55
-rw-r--r--src/systemd/dhclient6@.service18
-rw-r--r--src/systemd/dhclient@.service4
5 files changed, 38 insertions, 43 deletions
diff --git a/data/templates/dhcp-client/daemon-options.tmpl b/data/templates/dhcp-client/daemon-options.tmpl
index ec74a4234..8f995ab62 100644
--- a/data/templates/dhcp-client/daemon-options.tmpl
+++ b/data/templates/dhcp-client/daemon-options.tmpl
@@ -1 +1 @@
-DHCLIENT_OPTS="-nw -cf /run/dhclient/{{ ifname }}.conf -pf /run/dhclient/{{ ifname }}.pid -lf /run/dhclient/{{ ifname }}.leases {{ ifname }}"
+DHCLIENT_OPTS="-nw -cf {{ config_path }}/{{ ifname }}.conf -pf {{ config_path }}/{{ ifname }}.pid -lf {{ config_path }}/{{ ifname }}.leases {{ '-S' if dhcpv6_prm_only }} {{ '-T' if dhcpv6_temporary }} {{ ifname }}"
diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 83db40c5f..be0235add 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -1,4 +1,4 @@
-# generated by ifconfig.py
+# generated by dhcp.py
interface "{{ ifname }}" {
request routers, domain-name-servers, domain-name;
}
diff --git a/python/vyos/ifconfig/dhcp.py b/python/vyos/ifconfig/dhcp.py
index b045727a2..b9862652a 100644
--- a/python/vyos/ifconfig/dhcp.py
+++ b/python/vyos/ifconfig/dhcp.py
@@ -24,19 +24,20 @@ class _DHCP (Control):
super().__init__(**kargs)
self.file = {
'ifname': ifname,
- 'conf': self.client_base + f'{ifname}.conf',
- 'options': self.client_base + f'{ifname}.options',
- 'pid': self.client_base + f'{ifname}.pid',
- 'lease': self.client_base + f'{ifname}.leases',
+ 'conf': self.client_base + f'/{ifname}.conf',
+ 'options': self.client_base + f'/{ifname}.options',
+ 'pid': self.client_base + f'/{ifname}.pid',
+ 'lease': self.client_base + f'/{ifname}.leases',
}
class _DHCPv4 (_DHCP):
- client_base = r'/run/dhclient/'
+ client_base = r'/run/dhclient'
def __init__(self, ifname):
super().__init__(ifname)
self.options = FixedDict(**{
'ifname': ifname,
+ 'config_path': self.client_base,
'hostname': '',
'client_id': '',
'vendor_class_id': ''
@@ -62,7 +63,7 @@ class _DHCPv4 (_DHCP):
self.options['hostname'] = f.read().rstrip('\n')
render(self.file['options'], 'dhcp-client/daemon-options.tmpl', self.options)
- render(self.file['conf'], 'dhcp-client/ipv4.tmpl' ,self.options)
+ render(self.file['conf'], 'dhcp-client/ipv4.tmpl', self.options)
return self._cmd('systemctl restart dhclient@{ifname}.service'.format(**self.file))
@@ -89,12 +90,13 @@ class _DHCPv4 (_DHCP):
os.remove(self.file[name])
class _DHCPv6 (_DHCP):
- client_base = r'/run/dhclient6/'
+ client_base = r'/run/dhclient6'
def __init__(self, ifname):
super().__init__(ifname)
self.options = FixedDict(**{
'ifname': ifname,
+ 'config_path': self.client_base,
'dhcpv6_prm_only': False,
'dhcpv6_temporary': False,
})
@@ -111,7 +113,7 @@ class _DHCPv6 (_DHCP):
>>> from vyos.ifconfig import Interface
>>> j = Interface('eth0')
- >>> j.set_dhcpv6()
+ >>> j.dhcp.v6.set()
"""
# better save then sorry .. should be checked in interface script
@@ -120,29 +122,13 @@ class _DHCPv6 (_DHCP):
raise Exception(
'DHCPv6 temporary and parameters-only options are mutually exclusive!')
+ render(self.file['options'], 'dhcp-client/daemon-options.tmpl', self.options)
render(self.file['conf'], 'dhcp-client/ipv6.tmpl', self.options)
# no longer accept router announcements on this interface
self._write_sysfs(self.file['accept_ra'], 0)
- # assemble command-line to start DHCPv6 client (dhclient)
- cmd = 'start-stop-daemon'
- cmd += ' --start'
- cmd += ' --oknodo'
- cmd += ' --quiet'
- cmd += ' --pidfile {pid}'
- cmd += ' --exec /sbin/dhclient'
- cmd += ' --'
- # now pass arguments to dhclient binary
- cmd += ' -6 -nw -cf {conf} -pf {pid} -lf {lease}'
- # add optional arguments
- if self.options['dhcpv6_prm_only']:
- cmd += ' -S'
- if self.options['dhcpv6_temporary']:
- cmd += ' -T'
- cmd += ' {ifname}'
-
- return self._cmd(cmd.format(**self.file))
+ return self._cmd('systemctl restart dhclient6@{ifname}.service'.format(**self.file))
def delete(self):
"""
@@ -153,33 +139,24 @@ class _DHCPv6 (_DHCP):
>>> from vyos.ifconfig import Interface
>>> j = Interface('eth0')
- >>> j.del_dhcpv6()
+ >>> j.dhcp.v6.delete()
"""
if not os.path.isfile(self.file['pid']):
self._debug_msg('No DHCPv6 client PID found')
return None
- # with open(self.file['pid'], 'r') as f:
- # pid = int(f.read())
-
- # stop dhclient
- cmd = 'start-stop-daemon'
- cmd += ' --stop'
- cmd += ' --oknodo'
- cmd += ' --quiet'
- cmd += ' --pidfile {pid}'
- self._cmd(cmd.format(**self.file))
+ return self._cmd('systemctl stop dhclient6@{ifname}.service'.format(**self.file))
# accept router announcements on this interface
self._write_sysfs(self.file['accept_ra'], 1)
# cleanup old config files
- for name in ('conf', 'pid', 'lease'):
+ for name in ('conf', 'options', 'pid', 'lease'):
if os.path.isfile(self.file[name]):
os.remove(self.file[name])
-class DHCP (object):
+class DHCP(object):
def __init__(self, ifname):
self.v4 = _DHCPv4(ifname)
self.v6 = _DHCPv6(ifname)
diff --git a/src/systemd/dhclient6@.service b/src/systemd/dhclient6@.service
new file mode 100644
index 000000000..d871e7354
--- /dev/null
+++ b/src/systemd/dhclient6@.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=DHCPv6 client on %i
+Documentation=man:dhclient(8)
+RequiresMountsFor=/run
+ConditionPathExists=/run/dhclient6/%i.conf
+ConditionPathExists=/run/dhclient6/%i.options
+After=vyos-router.service
+
+[Service]
+WorkingDirectory=/run/dhclient6
+Type=exec
+EnvironmentFile=-/run/dhclient6/%i.options
+PIDFile=/run/dhclient6/%i.pid
+ExecStart=/sbin/dhclient -6 $DHCLIENT_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/systemd/dhclient@.service b/src/systemd/dhclient@.service
index 5e185908b..c6f1e4be1 100644
--- a/src/systemd/dhclient@.service
+++ b/src/systemd/dhclient@.service
@@ -1,5 +1,5 @@
[Unit]
-Description=DHCP client on %i (IPv4)
+Description=DHCP client on %i
Documentation=man:dhclient(8)
RequiresMountsFor=/run
ConditionPathExists=/run/dhclient/%i.conf
@@ -8,7 +8,7 @@ After=vyos-router.service
[Service]
WorkingDirectory=/run/dhclient
-Type=simple
+Type=forking
EnvironmentFile=-/run/dhclient/%i.options
PIDFile=/run/dhclient/%i.pid
ExecStart=/sbin/dhclient -4 $DHCLIENT_OPTS
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 15:35:27 +0000