diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-05 08:29:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-05 08:29:22 +0200 |
| commit | 4a323118538bbf0bd4a55c8866e2db911fa09469 (patch) | |
| tree | 61bdc3e551c21e6f90bca85ed76ba7f8ffe894f5 | |
| parent | 012d4d75232efe2337296b50f2bbcbe6a19562ed (diff) | |
| parent | 9122a7d0a0f9aa4775a008def7d43e44717d1cbc (diff) | |
| download | vyos-1x-4a323118538bbf0bd4a55c8866e2db911fa09469.tar.gz vyos-1x-4a323118538bbf0bd4a55c8866e2db911fa09469.zip | |
Merge pull request #3783 from vyos/mergify/bp/circinus/pr-3782
wireless: T4287: use Debian postinst over preinst when using update-alternatives (backport #3782)
| -rw-r--r-- | debian/vyos-1x.postinst | 3 | ||||
| -rw-r--r-- | debian/vyos-1x.preinst | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst index 26b81db6f..141a9e8f9 100644 --- a/debian/vyos-1x.postinst +++ b/debian/vyos-1x.postinst @@ -256,3 +256,6 @@ python3 /usr/lib/python3/dist-packages/vyos/xml_ref/update_cache.py if [ ! -f /lib/systemd/system/ssh@.service ]; then ln /lib/systemd/system/ssh.service /lib/systemd/system/ssh@.service fi + +# T4287 - as we have a non-signed kernel use the upstream wireless reulatory database +update-alternatives --set regulatory.db /lib/firmware/regulatory.db-upstream diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst index dbad8bfa8..fbfc85566 100644 --- a/debian/vyos-1x.preinst +++ b/debian/vyos-1x.preinst @@ -9,6 +9,3 @@ dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplugd.conf dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplug dpkg-divert --package vyos-1x --add --no-rename /etc/rsyslog.d/45-frr.conf dpkg-divert --package vyos-1x --add --no-rename /lib/udev/rules.d/99-systemd.rules - -# T4287 - as we have a non-signed kernel use the upstream wireless reulatory database -update-alternatives --set regulatory.db /lib/firmware/regulatory.db-upstream |