summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-20 20:42:05 +0200
committerChristian Poessinger <christian@poessinger.com>2021-06-20 20:42:05 +0200
commit9b71d555575c0fa217a137cffaaafce5eb35d18e (patch)
treefee34c5cb2356333fb54bc6e51ee8c4c2fbfe494 /debian
parentb776edb38a4755be76e965ca719e9428bcc570e6 (diff)
parent70f7f06e778efa4bd3c2ad127d66c080e1db80c5 (diff)
downloadvyos-1x-9b71d555575c0fa217a137cffaaafce5eb35d18e.tar.gz
vyos-1x-9b71d555575c0fa217a137cffaaafce5eb35d18e.zip
Merge branch 'bullseye' into current
* bullseye: T3641: fastnetmon package is not available for Debian Bullseye T3641: lcdproc.service is now shipped in lcdproc package T3641: file /etc/ppp/ip-pre-up is already provided by ppp package
Diffstat (limited to 'debian')
-rw-r--r--debian/control1
-rw-r--r--debian/vyos-1x.install1
2 files changed, 0 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 586140af0..2ee6609b3 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,6 @@ Depends:
easy-rsa,
etherwake,
ethtool,
- fastnetmon,
file,
frr (>= 7.5),
frr-pythontools,
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
index 7d12f3bc1..32a2c4b7c 100644
--- a/debian/vyos-1x.install
+++ b/debian/vyos-1x.install
@@ -3,7 +3,6 @@ etc/dhcp
etc/ipsec.d
etc/netplug
etc/opennhrp
-etc/ppp
etc/rsyslog.d
etc/systemd
etc/sysctl.d