summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-02-23 15:32:51 +0100
committerChristian Poessinger <christian@poessinger.com>2020-02-23 15:32:51 +0100
commitf4e60d02df629f903fc677ad519fecc3f2e2b7be (patch)
tree314508ae5e9222e9daf75ba744d114fc76b09b5b /debian
parent373fcb829e95b52c6edd5fafd087012988d66c07 (diff)
parent9621e4b7552df43876f153db1d1156ad8c4ba72c (diff)
downloadvyos-1x-f4e60d02df629f903fc677ad519fecc3f2e2b7be.tar.gz
vyos-1x-f4e60d02df629f903fc677ad519fecc3f2e2b7be.zip
Merge branch 'pppoe-rewrite' of https://github.com/c-po/vyos-1x into current
* 'pppoe-rewrite' of https://github.com/c-po/vyos-1x: (23 commits) pppoe: T2055: do not try to start a deleted dialer interface pppoe: T1318: declutter name-server CLI nodes pppoe: T2055: remove router-advert node in client interface pppoe: T1318: migrate user-id and password nodes under an authentication node pppoe: T1318: rename link to source-interface pppoe: T1318: use include files for disable and descriptionx pppoe: T1318: rephrase help text on default-route interface-definitions: include: disable: rephrase help text pppoe: T1318: extend migrator for firewall, qos and ip routing nodes pppoe: T1318: proper delete old interfaces in migrator pppoe: T1318: increase priority so PPPoE is run after bond interfaces pppoe: T1318: fix migrator and add missing link statement pppoe: T1318: use lists rather then strings on Config() pppoe: T1318: support interface description pppoe: T1318: remove obsolete ipv6-up.d script pppoe: T1318: add op-mode commands for link information pppoe: T1318: use systemd to manage connection pppoe: T1318: remove process startup debug output pppoe: T1318: move process startup to apply() pppoe: T1318: "link" option is mandatory ...
Diffstat (limited to 'debian')
-rw-r--r--debian/control1
-rw-r--r--debian/vyos-1x.install4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index dc6c9a8f4..fbcc3fa2e 100644
--- a/debian/control
+++ b/debian/control
@@ -84,6 +84,7 @@ Depends: python3,
wireless-regdb,
pmacct (>= 1.6.0),
python3-certbot-nginx,
+ pppoe,
${shlibs:Depends},
${misc:Depends}
Description: VyOS configuration scripts and data
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
index e1236b75b..eb19dafeb 100644
--- a/debian/vyos-1x.install
+++ b/debian/vyos-1x.install
@@ -1,7 +1,7 @@
+etc/dhcp
etc/init.d
-etc/vyos
etc/systemd
-etc/dhcp
+etc/vyos
lib/
opt/
usr/