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

4 files changed, 0 insertions, 66 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
diff --git a/src/etc/ppp/ip-pre-up b/src/etc/ppp/ip-pre-up
deleted file mode 100755
index 05840650b..000000000
--- a/src/etc/ppp/ip-pre-up
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# This script is run by the pppd when the link is created.
-# It uses run-parts to run scripts in /etc/ppp/ip-pre-up.d, to
-# change name, setup firewall,etc  you should create script(s) there.
-#
-# Be aware that other packages may include /etc/ppp/ip-pre-up.d scripts (named
-# after that package), so choose local script names with that in mind.
-#
-# This script is called with the following arguments:
-#    Arg  Name                          Example
-#    $1   Interface name                ppp0
-#    $2   The tty                       ttyS1
-#    $3   The link speed                38400
-#    $4   Local IP number               12.34.56.78
-#    $5   Peer  IP number               12.34.56.99
-#    $6   Optional ``ipparam'' value    foo
-
-# The  environment is cleared before executing this script
-# so the path must be reset
-PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-export PATH
-
-# These variables are for the use of the scripts run by run-parts
-PPP_IFACE="$1"
-PPP_TTY="$2"
-PPP_SPEED="$3"
-PPP_LOCAL="$4"
-PPP_REMOTE="$5"
-PPP_IPPARAM="$6"
-export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
-
-# as an additional convenience, $PPP_TTYNAME is set to the tty name,
-# stripped of /dev/ (if present) for easier matching.
-PPP_TTYNAME=`/usr/bin/basename "$2"`
-export PPP_TTYNAME
-
-# If /var/log/ppp-ipupdown.log exists use it for logging.
-if [ -e /var/log/ppp-ipupdown.log ]; then
-  exec > /var/log/ppp-ipupdown.log 2>&1
-  echo $0 $*
-  echo
-fi
-
-# This script can be used to override the .d files supplied by other packages.
-if [ -x /etc/ppp/ip-pre-up.local ]; then
-  exec /etc/ppp/ip-pre-up.local "$*"
-fi
-
-run-parts /etc/ppp/ip-pre-up.d \
- --arg="$1" --arg="$2" --arg="$3" --arg="$4" --arg="$5" --arg="$6"
diff --git a/src/systemd/lcdproc.service b/src/systemd/lcdproc.service
deleted file mode 100644
index ef717667a..000000000
--- a/src/systemd/lcdproc.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=LCDproc system status information viewer on %I
-Documentation=man:lcdproc(8) http://www.lcdproc.org/
-After=vyos-router.service LCDd.service
-Requires=LCDd.service
-
-[Service]
-User=root
-ExecStart=/usr/bin/lcdproc -f -c /run/lcdproc/lcdproc.conf
-PIDFile=/run/lcdproc/lcdproc.pid
-
-[Install]
-WantedBy=multi-user.target