Skip to content

openbsd: properly restart the network on 7.0 #1150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheRealFalcon merged 1 commit into from
Jan 4, 2022
Merged

openbsd: properly restart the network on 7.0 #1150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions cloudinit/net/openbsd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file is part of cloud-init. See LICENSE file for license information.

import platform

import cloudinit.net.bsd
from cloudinit import log as logging
from cloudinit import subp, util
Expand Down Expand Up @@ -30,13 +32,21 @@ def write_config(self):
util.write_file(fn, content)

def start_services(self, run=False):
has_dhcpleasectl = bool(int(platform.release().split(".")[0]) > 6)
if not self._postcmds:
LOG.debug("openbsd generate postcmd disabled")
return
subp.subp(["pkill", "dhclient"], capture=True, rcs=[0, 1])
subp.subp(["route", "del", "default"], capture=True, rcs=[0, 1])
subp.subp(["route", "flush", "default"], capture=True, rcs=[0, 1])
subp.subp(["sh", "/etc/netstart"], capture=True)
if has_dhcpleasectl: # OpenBSD 7.0+
subp.subp(["sh", "/etc/netstart"], capture=True)
for interface in self.dhcp_interfaces():
subp.subp(
["dhcpleasectl", "-w", "30", interface], capture=True
)
else:
subp.subp(["pkill", "dhclient"], capture=True, rcs=[0, 1])
subp.subp(["route", "del", "default"], capture=True, rcs=[0, 1])
subp.subp(["route", "flush", "default"], capture=True, rcs=[0, 1])
subp.subp(["sh", "/etc/netstart"], capture=True)

def set_route(self, network, netmask, gateway):
if network == "0.0.0.0":
Expand Down