diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-04 20:07:08 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-07-04 18:31:15 +0000 |
| commit | 9122a7d0a0f9aa4775a008def7d43e44717d1cbc (patch) | |
| tree | 22d7a00538795a1b4875b8b5a8d18021ef4dacc6 | |
| parent | 03f91b085a3daf6e1a7dee4df895d6e0a0212a2b (diff) | |
| download | vyos-1x-9122a7d0a0f9aa4775a008def7d43e44717d1cbc.tar.gz vyos-1x-9122a7d0a0f9aa4775a008def7d43e44717d1cbc.zip | |
wireless: T4287: use Debian postinst over preinst when using update-alternatives
This fixes an error during ISO assembly:
update-alternatives: error: no alternatives for regulatory.db
dpkg: error processing archive /tmp/apt-dpkg-install-PJplR3/00-vyos-1x_1.5dev0-1880-gecaa44498_amd64.deb (--unpack):
new vyos-1x package pre-installation script subprocess returned error exit status 2
(cherry picked from commit a414190447c32be0775a077cde13cef0cf2b8c54)
| -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 |