diff options
| -rw-r--r-- | .gitmodules | 58 | ||||
| -rw-r--r-- | data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 8 | ||||
| m--------- | packages/vyos-accel-ppp | 0 |
3 files changed, 59 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index a6c4072e..dc756f60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,144 +1,196 @@ [submodule "packages/vyatta-bash"] path = packages/vyatta-bash url = https://github.com/vyos/vyatta-bash.git + branch = current [submodule "packages/vyatta-cfg"] path = packages/vyatta-cfg url = https://github.com/vyos/vyatta-cfg.git + branch = current [submodule "packages/vyatta-op"] path = packages/vyatta-op url = https://github.com/vyos/vyatta-op.git + branch = current [submodule "packages/vyatta-cfg-system"] path = packages/vyatta-cfg-system url = https://github.com/vyos/vyatta-cfg-system.git + branch = current [submodule "packages/vyatta-cfg-firewall"] path = packages/vyatta-cfg-firewall url = https://github.com/vyos/vyatta-cfg-firewall.git + branch = current [submodule "packages/vyatta-op-firewall"] path = packages/vyatta-op-firewall url = https://github.com/vyos/vyatta-op-firewall.git + branch = current [submodule "packages/vyatta-cfg-vpn"] path = packages/vyatta-cfg-vpn url = https://github.com/vyos/vyatta-cfg-vpn.git + branch = current [submodule "packages/vyatta-op-vpn"] path = packages/vyatta-op-vpn url = https://github.com/vyos/vyatta-op-vpn.git + branch = current [submodule "packages/vyatta-cfg-qos"] path = packages/vyatta-cfg-qos url = https://github.com/vyos/vyatta-cfg-qos.git + branch = current [submodule "packages/vyatta-op-qos"] path = packages/vyatta-op-qos url = https://github.com/vyos/vyatta-op-qos.git + branch = current [submodule "packages/vyatta-cfg-op-pppoe"] path = packages/vyatta-cfg-op-pppoe url = https://github.com/vyos/vyatta-cfg-op-pppoe.git + branch = current [submodule "packages/vyatta-openvpn"] path = packages/vyatta-openvpn url = https://github.com/vyos/vyatta-openvpn.git + branch = current [submodule "packages/vyatta-conntrack"] path = packages/vyatta-conntrack url = https://github.com/vyos/vyatta-conntrack.git + branch = current [submodule "packages/vyatta-conntrack-sync"] path = packages/vyatta-conntrack-sync url = https://github.com/vyos/vyatta-conntrack-sync.git + branch = current [submodule "packages/vyatta-nat"] path = packages/vyatta-nat url = https://github.com/vyos/vyatta-nat.git + branch = current [submodule "packages/vyatta-config-mgmt"] path = packages/vyatta-config-mgmt url = https://github.com/vyos/vyatta-config-mgmt.git + branch = current [submodule "packages/vyatta-config-migrate"] path = packages/vyatta-config-migrate url = https://github.com/vyos/vyatta-config-migrate.git + branch = current [submodule "packages/vyatta-zone"] path = packages/vyatta-zone url = https://github.com/vyos/vyatta-zone.git + branch = current [submodule "packages/vyatta-cluster"] path = packages/vyatta-cluster url = https://github.com/vyos/vyatta-cluster.git + branch = current [submodule "packages/vyatta-vrrp"] path = packages/vyatta-vrrp url = https://github.com/vyos/vyatta-vrrp.git + branch = current [submodule "packages/vyatta-eventwatch"] path = packages/vyatta-eventwatch url = https://github.com/vyos/vyatta-eventwatch.git + branch = current [submodule "packages/vyatta-webproxy"] path = packages/vyatta-webproxy url = https://github.com/vyos/vyatta-webproxy.git + branch = current [submodule "packages/vyatta-webgui"] path = packages/vyatta-webgui url = https://github.com/vyos/vyatta-webgui.git + branch = current [submodule "packages/vyatta-cfg-quagga"] path = packages/vyatta-cfg-quagga url = https://github.com/vyos/vyatta-cfg-quagga.git + branch = current [submodule "packages/vyatta-op-quagga"] path = packages/vyatta-op-quagga url = https://github.com/vyos/vyatta-op-quagga.git + branch = current [submodule "packages/vyatta-op-dhcp-server"] path = packages/vyatta-op-dhcp-server url = https://github.com/vyos/vyatta-op-dhcp-server.git + branch = current [submodule "packages/vyatta-wireless"] path = packages/vyatta-wireless url = https://github.com/vyos/vyatta-wireless.git + branch = current [submodule "packages/vyatta-wirelessmodem"] path = packages/vyatta-wirelessmodem url = https://github.com/vyos/vyatta-wirelessmodem.git + branch = current [submodule "packages/vyatta-wanloadbalance"] path = packages/vyatta-wanloadbalance url = https://github.com/vyos/vyatta-wanloadbalance.git + branch = current [submodule "packages/vyatta-netflow"] path = packages/vyatta-netflow url = https://github.com/vyos/vyatta-netflow.git + branch = current [submodule "packages/vyatta-lldp"] path = packages/vyatta-lldp url = https://github.com/vyos/vyatta-lldp.git + branch = current [submodule "packages/vyatta-ipv6-rtradv"] path = packages/vyatta-ipv6-rtradv url = https://github.com/vyos/vyatta-ipv6-rtradv.git + branch = current [submodule "packages/vyatta-ravpn"] path = packages/vyatta-ravpn url = https://github.com/vyos/vyatta-ravpn.git + branch = current [submodule "packages/vyos-pppoe-server"] path = packages/vyos-pppoe-server url = https://github.com/vyos/vyos-pppoe-server.git + branch = current [submodule "packages/vyos-nhrp"] path = packages/vyos-nhrp url = https://github.com/vyos/vyos-nhrp.git + branch = current [submodule "packages/vyatta-util"] path = packages/vyatta-util url = https://github.com/vyos/vyatta-util.git + branch = current [submodule "packages/vyos-world"] path = packages/vyos-world url = https://github.com/vyos/vyos-world.git + branch = current [submodule "packages/vyos-kernel"] path = packages/vyos-kernel url = https://github.com/vyos/vyos-kernel.git + branch = linux-vyos-4.19.y [submodule "packages/vyos-1x"] path = packages/vyos-1x url = https://github.com/vyos/vyos-1x.git + branch = current [submodule "packages/mdns-repeater"] path = packages/mdns-repeater url = https://github.com/vyos/mdns-repeater.git + branch = current [submodule "packages/udp-broadcast-relay"] path = packages/udp-broadcast-relay url = https://github.com/vyos/udp-broadcast-relay.git + branch = current [submodule "packages/vyos-keepalived"] path = packages/vyos-keepalived url = https://github.com/vyos/vyos-keepalived.git + branch = current [submodule "packages/vyatta-iproute"] path = packages/vyatta-iproute url = https://github.com/vyos/vyatta-iproute.git + branch = iproute2-vyos-4.18.y [submodule "packages/vyatta-quagga"] path = packages/vyatta-quagga url = https://github.com/vyos/vyatta-quagga.git + branch = current [submodule "packages/vyos-wireguard"] path = packages/vyos-wireguard - url = https://github.com/vyos/vyos-wireguard + url = https://github.com/vyos/vyos-wireguard.git + branch = current [submodule "packages/pmacct"] path = packages/pmacct - url = https://github.com/vyos/pmacct + url = https://github.com/vyos/pmacct.git + branch = current [submodule "packages/vyos-strongswan"] path = packages/vyos-strongswan - url = https://github.com/vyos/vyos-strongswan + url = https://github.com/vyos/vyos-strongswan.git + branch = current [submodule "packages/vyos-frr"] path = packages/vyos-frr url = https://github.com/vyos/vyos-frr.git + branch = current +[submodule "packages/vyos-accel-ppp"] + path = packages/vyos-accel-ppp + url = https://github.com/vyos/vyos-accel-ppp.git + branch = current diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry index 4107e459..ae34e4ee 100644 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry +++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry @@ -1,20 +1,20 @@ menuentry "VyOS (KVM console)" { - linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 + linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,9600 console=tty0 initrd /boot//initrd.img } menuentry "VyOS (Serial console)" { - linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 + linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,9600 initrd /boot//initrd.img } menuentry "Lost password change (KVM console)" { - linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,9600 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } menuentry "Lost password change (Serial console)" { - linux /boot//vmlinuz boot=live quiet vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,9600 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } diff --git a/packages/vyos-accel-ppp b/packages/vyos-accel-ppp new file mode 160000 +Subproject df95d6b78be568cbce40fe7b2632dfb9697d207 |