diff options
| author | Cheeze-It <16260577+Cheeze-It@users.noreply.github.com> | 2023-04-04 07:41:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 07:41:59 -0700 |
| commit | 4d5bc82590533c2f1d65334636fd8427c2a1bf6b (patch) | |
| tree | 1a5479aec55199ac195bd4c6761d7e693cdbfb8a /debian | |
| parent | d6ef0c54ad8c8f9f2c5f1811781dba6111201fe4 (diff) | |
| parent | 94b65bb3936b607a6bc85fe23176ff855c722519 (diff) | |
| download | vyos-1x-4d5bc82590533c2f1d65334636fd8427c2a1bf6b.tar.gz vyos-1x-4d5bc82590533c2f1d65334636fd8427c2a1bf6b.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/vyos-1x.postinst | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/control b/debian/control index 028b7cd43..8cd49f62a 100644 --- a/debian/control +++ b/debian/control @@ -99,6 +99,7 @@ Depends: mtr-tiny, ndisc6, ndppd, + netavark, netplug, nfct, nftables (>= 0.9.3), diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst index f6693c799..ddc189508 100644 --- a/debian/vyos-1x.postinst +++ b/debian/vyos-1x.postinst @@ -115,5 +115,12 @@ done sed -i '/^\/var\/log\/messages$/d' /etc/logrotate.d/rsyslog sed -i '/^\/var\/log\/auth.log$/d' /etc/logrotate.d/rsyslog +# Fix FRR pam.d "vtysh_pam" vtysh_pam: Failed in account validation T5110 +if test -f /etc/pam.d/frr; then + if grep -q 'pam_rootok.so' /etc/pam.d/frr; then + sed -i -re 's/rootok/permit/' /etc/pam.d/frr + fi +fi + # Generate API GraphQL schema /usr/libexec/vyos/services/api/graphql/generate/generate_schema.py |