From f7d576c263d45c21e118ab573647e9cd8343f674 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 9 Oct 2018 21:19:36 +0200 Subject: Add vyos-strongswan submodule --- .gitmodules | 3 +++ packages/vyos-strongswan | 1 + 2 files changed, 4 insertions(+) create mode 160000 packages/vyos-strongswan diff --git a/.gitmodules b/.gitmodules index fe47ce28..a527f569 100644 --- a/.gitmodules +++ b/.gitmodules @@ -142,3 +142,6 @@ [submodule "packages/pmacct"] path = packages/pmacct url = https://github.com/vyos/pmacct +[submodule "packages/vyos-strongswan"] + path = packages/vyos-strongswan + url = https://github.com/vyos/vyos-strongswan diff --git a/packages/vyos-strongswan b/packages/vyos-strongswan new file mode 160000 index 00000000..5f1a6880 --- /dev/null +++ b/packages/vyos-strongswan @@ -0,0 +1 @@ +Subproject commit 5f1a6880eb6ac98deb48b915bc574c2a5260831e -- cgit v1.2.3 From 5335d2c8b5e04b66b494c9e0584fb23a61d662cd Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 12 Oct 2018 20:17:29 +0200 Subject: T852: globally disable StrongSWAN FARP plugin --- .../hooks/30-strongswan-configs.chroot | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/data/live-build-config/hooks/30-strongswan-configs.chroot b/data/live-build-config/hooks/30-strongswan-configs.chroot index 798b0d6d..25562a65 100755 --- a/data/live-build-config/hooks/30-strongswan-configs.chroot +++ b/data/live-build-config/hooks/30-strongswan-configs.chroot @@ -8,22 +8,31 @@ import re -# Disable the cisco_unity option in charon.conf +# Disable the 'cisco_unity' option in charon.conf with open('/etc/strongswan.d/charon.conf', 'r') as f: charon_conf = f.read() - charon_conf = re.sub(r'# (cisco_unity = no)', r"\1", charon_conf) with open('/etc/strongswan.d/charon.conf', 'w') as f: f.write(charon_conf) -# Prevent the unity plugin from loading +# Prevent the 'cisco_unity' plugin from loading with open('/etc/strongswan.d/charon/unity.conf', 'r') as f: unity_conf = f.read() - unity_conf = re.sub(r'load = yes', r'load = no', unity_conf) with open('/etc/strongswan.d/charon/unity.conf', 'w') as f: f.write(unity_conf) + + + +# Prevent the 'farp' plugin from loading +with open('/etc/strongswan.d/charon/farp.conf', 'r') as f: + farp_conf = f.read() + + farp_conf = re.sub(r'load = yes', r'load = no', farp_conf) + +with open('/etc/strongswan.d/charon/farp.conf', 'w') as f: + f.write(farp_conf) -- cgit v1.2.3 From 037ab22e4c7610ab3fab6f3c8823fbe5490cf2e5 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 14 Oct 2018 13:07:17 +0200 Subject: T892: disable salt-minion service by default --- data/live-build-config/hooks/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/18-enable-disable_services.chroot b/data/live-build-config/hooks/18-enable-disable_services.chroot index e525cf56..d4d89ba8 100755 --- a/data/live-build-config/hooks/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/18-enable-disable_services.chroot @@ -37,3 +37,4 @@ systemctl disable tftpd-hpa.service systemctl disable strongswan.service systemctl disable frr.service +systemctl disable salt-minion.service -- cgit v1.2.3 From 85c00ad7e1429bc4168baa54329c949646e9ad7f Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Sun, 14 Oct 2018 21:43:10 +0200 Subject: move getty conf to vyatta-cfg package --- .../includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf diff --git a/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf b/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf deleted file mode 100644 index 7eee7bd3..00000000 --- a/data/live-build-config/includes.chroot/etc/systemd/system/getty@.service.d/aftervyos.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -After=vyatta-router.service -- cgit v1.2.3 From 5444a9eda2eee4e3c7a5cceb6630f1dd8d657024 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 15 Oct 2018 13:58:06 +0200 Subject: T895: increase default log level for facility 'all'. --- .../includes.chroot/opt/vyatta/etc/config.boot.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default index 0a75716b..1509ac85 100644 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default +++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default @@ -12,7 +12,7 @@ system { syslog { global { facility all { - level notice + level info } facility protocols { level debug -- cgit v1.2.3 From 39b0eab57ec86d6a39052760c5eec5b893586af6 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 15 Oct 2018 15:09:29 +0200 Subject: T879: add the release GPG key to the image. --- .../live-build-config/archives/vyos-dev.key.chroot | 32 +++++++++++++ .../archives/vyos-release.key.chroot | 52 ++++++++++++++++++++++ data/live-build-config/archives/vyos.key.chroot | 32 ------------- 3 files changed, 84 insertions(+), 32 deletions(-) create mode 100644 data/live-build-config/archives/vyos-dev.key.chroot create mode 100644 data/live-build-config/archives/vyos-release.key.chroot delete mode 100644 data/live-build-config/archives/vyos.key.chroot diff --git a/data/live-build-config/archives/vyos-dev.key.chroot b/data/live-build-config/archives/vyos-dev.key.chroot new file mode 100644 index 00000000..a6522e36 --- /dev/null +++ b/data/live-build-config/archives/vyos-dev.key.chroot @@ -0,0 +1,32 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mQENBFOQPGwBCADjm8Oq3kaJQh0rI33XVfd9mNq5ffay884SlDCbG1hkLVf8tnGV +cjH7/nFfJdW/6Gr4dj4LQuHHnin5QeWnlHfuOySlOEsJCNP5dm14oEjy7epSXOv2 +A3m2tPDDqwMgfrOyw1gN+Clit9QIujiRzbcakqearyNxcVNvinIVunNiWbAyIhvc +uI6yfMjno4q/O83c7e1zBqJj9t9guQjBuqaJrmZVf985/6ue9yWzSI4JtzxVmhKI +dfCxHWE7BiEt2hnZPSVGcb4q6cBrkpcra7Ny55eoyN51wQGokPv3a9/8b3r5speR +gene2MTvD/3eZOtTvMN000f/gJX4E6o8xx+fABEBAAG0R1Z5T1MgTWFpbnRhaW5l +cnMgKERldmVsb3BtZW50IGFuZCB0ZXN0aW5nIHJlcG9zKSA8bWFpbnRhaW5lcnNA +dnlvcy5uZXQ+iQE4BBMBAgAiBQJTkDxsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe +AQIXgAAKCRAywkm9DfBLXJbHB/4xlwn+6cZGEWWNZgXwUTMeHubZItl1o3Tbrzaa +E3EqYyHJMYb3gBLOomlw7JLw5qT/247tlPC8ricl+BpeE5vYA3a08mIpcymROFh6 +pKJLNvdZHjrVN9yH2xYifI5sIDyuPga8Bgq/BMRiB1ragS/on2aUs75+tsEI32NI +JO8+jIav0Nd6n/Wmw55ioTXS3fx6VDb64D80luOf1ve5LFDs8Oz2I+ZjSf7mPMY/ +b9qQHNb/300k/tIeK2F4G7LFu6o/1YMlrv0Ry7j9BsLzIkmTh0pX4mSVvF6IrxsZ +WJRKu3uQDH2qccjptZDq4jHo/ow+aWT8rakjOgL9nJgKD5u/uQENBFOQPGwBCAC0 +zHpsmcfUIDyflGL+vwHV/3L02/vItHXfIkugL+wFB9C9i6nWA1KqNJwqNflJLGQF +y+vHXs0oa3oMKj7S3p2zTbuU8s9Vz2Cg5c15sy7yGjh/LTwVOR5ZJrgbRJxTTp9K +j5bkrx/DbDjIQ5szyjZ5N1ZAUyUx5Z/xMB3mTnLxDASvaoq+/F6WNcYY7NzjI7M0 +SFtnZLj6MFUVTmSbyYdGQc/Cxu5Utl7WKJUqHW5z10vJruZsdKV2+vf98yqhAJ+v +wPhKUoVD+KtCH/CrHFrVq0hCKIMtyPLtaTeR/QnCNDEsV4p82HB9KQOYEADEL3/A +a7Dntf3Xi+5eO/3MlnshABEBAAGJAR8EGAECAAkFAlOQPGwCGwwACgkQMsJJvQ3w +S1z+wwf9GnVn9GhbB1FhKQdavljp9rUzz8FvH3tRpftdhhJ8B0PVAMl4QRcIXrgD +nyd1K9ggzyWa4Z/9PygvH0Njv4YWlZh900wei9uVD8am1ncgQ/Jqlb36WvXyr8W/ +VPzQDtKAOkUz6RhKQ4V6I0PBK9nGeqeFkeH1bF1uGXkKpa0hGWffyOT1VasaZVXT +UN4VAYNzBwkoU0mIYK73CPi7e4YJrtOp/i8MGDL3pxKaZEEZJdc4/dZassqBuwSG +MRr2kecj9f53KWI0jLQdLgTMJQxscotfzhsWoF/842sUCbezwV3/4FtBhlNeqUHA +c9HOeh3wbjjt4uONvxeleE+jM9v63Q== +=gflA +-----END PGP PUBLIC KEY BLOCK----- + diff --git a/data/live-build-config/archives/vyos-release.key.chroot b/data/live-build-config/archives/vyos-release.key.chroot new file mode 100644 index 00000000..ff47c683 --- /dev/null +++ b/data/live-build-config/archives/vyos-release.key.chroot @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +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 +8vzPzaWHhkOkU8/J/Ci7+vNtUOZb +=Ld8S +-----END PGP PUBLIC KEY BLOCK----- diff --git a/data/live-build-config/archives/vyos.key.chroot b/data/live-build-config/archives/vyos.key.chroot deleted file mode 100644 index a6522e36..00000000 --- a/data/live-build-config/archives/vyos.key.chroot +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBFOQPGwBCADjm8Oq3kaJQh0rI33XVfd9mNq5ffay884SlDCbG1hkLVf8tnGV -cjH7/nFfJdW/6Gr4dj4LQuHHnin5QeWnlHfuOySlOEsJCNP5dm14oEjy7epSXOv2 -A3m2tPDDqwMgfrOyw1gN+Clit9QIujiRzbcakqearyNxcVNvinIVunNiWbAyIhvc -uI6yfMjno4q/O83c7e1zBqJj9t9guQjBuqaJrmZVf985/6ue9yWzSI4JtzxVmhKI -dfCxHWE7BiEt2hnZPSVGcb4q6cBrkpcra7Ny55eoyN51wQGokPv3a9/8b3r5speR -gene2MTvD/3eZOtTvMN000f/gJX4E6o8xx+fABEBAAG0R1Z5T1MgTWFpbnRhaW5l -cnMgKERldmVsb3BtZW50IGFuZCB0ZXN0aW5nIHJlcG9zKSA8bWFpbnRhaW5lcnNA -dnlvcy5uZXQ+iQE4BBMBAgAiBQJTkDxsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe -AQIXgAAKCRAywkm9DfBLXJbHB/4xlwn+6cZGEWWNZgXwUTMeHubZItl1o3Tbrzaa -E3EqYyHJMYb3gBLOomlw7JLw5qT/247tlPC8ricl+BpeE5vYA3a08mIpcymROFh6 -pKJLNvdZHjrVN9yH2xYifI5sIDyuPga8Bgq/BMRiB1ragS/on2aUs75+tsEI32NI -JO8+jIav0Nd6n/Wmw55ioTXS3fx6VDb64D80luOf1ve5LFDs8Oz2I+ZjSf7mPMY/ -b9qQHNb/300k/tIeK2F4G7LFu6o/1YMlrv0Ry7j9BsLzIkmTh0pX4mSVvF6IrxsZ -WJRKu3uQDH2qccjptZDq4jHo/ow+aWT8rakjOgL9nJgKD5u/uQENBFOQPGwBCAC0 -zHpsmcfUIDyflGL+vwHV/3L02/vItHXfIkugL+wFB9C9i6nWA1KqNJwqNflJLGQF -y+vHXs0oa3oMKj7S3p2zTbuU8s9Vz2Cg5c15sy7yGjh/LTwVOR5ZJrgbRJxTTp9K -j5bkrx/DbDjIQ5szyjZ5N1ZAUyUx5Z/xMB3mTnLxDASvaoq+/F6WNcYY7NzjI7M0 -SFtnZLj6MFUVTmSbyYdGQc/Cxu5Utl7WKJUqHW5z10vJruZsdKV2+vf98yqhAJ+v -wPhKUoVD+KtCH/CrHFrVq0hCKIMtyPLtaTeR/QnCNDEsV4p82HB9KQOYEADEL3/A -a7Dntf3Xi+5eO/3MlnshABEBAAGJAR8EGAECAAkFAlOQPGwCGwwACgkQMsJJvQ3w -S1z+wwf9GnVn9GhbB1FhKQdavljp9rUzz8FvH3tRpftdhhJ8B0PVAMl4QRcIXrgD -nyd1K9ggzyWa4Z/9PygvH0Njv4YWlZh900wei9uVD8am1ncgQ/Jqlb36WvXyr8W/ -VPzQDtKAOkUz6RhKQ4V6I0PBK9nGeqeFkeH1bF1uGXkKpa0hGWffyOT1VasaZVXT -UN4VAYNzBwkoU0mIYK73CPi7e4YJrtOp/i8MGDL3pxKaZEEZJdc4/dZassqBuwSG -MRr2kecj9f53KWI0jLQdLgTMJQxscotfzhsWoF/842sUCbezwV3/4FtBhlNeqUHA -c9HOeh3wbjjt4uONvxeleE+jM9v63Q== -=gflA ------END PGP PUBLIC KEY BLOCK----- - -- cgit v1.2.3 From d2ab6431c5157efaa767ee5861c8a4b38969ed16 Mon Sep 17 00:00:00 2001 From: hagbard Date: Mon, 15 Oct 2018 15:16:16 -0700 Subject: T455: Add haveged package --- data/live-build-config/package-lists/vyos-utils.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/package-lists/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot index bc5d8e7e..ef9e994a 100644 --- a/data/live-build-config/package-lists/vyos-utils.list.chroot +++ b/data/live-build-config/package-lists/vyos-utils.list.chroot @@ -18,3 +18,4 @@ iperf3 iftop lsof openssh-client +haveged -- cgit v1.2.3 From 53750b39cd6bf246ae3c52cea4d15b93264c486b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 17 Oct 2018 21:11:23 +0200 Subject: T913: move dhcp-relay service to vyos-1x --- .gitmodules | 3 --- packages/vyatta-cfg-dhcp-relay | 1 - 2 files changed, 4 deletions(-) delete mode 160000 packages/vyatta-cfg-dhcp-relay diff --git a/.gitmodules b/.gitmodules index a527f569..9bd70348 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,9 +73,6 @@ [submodule "packages/vyatta-op-quagga"] path = packages/vyatta-op-quagga url = https://github.com/vyos/vyatta-op-quagga.git -[submodule "packages/vyatta-cfg-dhcp-relay"] - path = packages/vyatta-cfg-dhcp-relay - url = https://github.com/vyos/vyatta-cfg-dhcp-relay.git [submodule "packages/vyatta-op-dhcp-server"] path = packages/vyatta-op-dhcp-server url = https://github.com/vyos/vyatta-op-dhcp-server.git diff --git a/packages/vyatta-cfg-dhcp-relay b/packages/vyatta-cfg-dhcp-relay deleted file mode 160000 index 85c7b8b9..00000000 --- a/packages/vyatta-cfg-dhcp-relay +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 85c7b8b985685e859067ff75afebdb6fa64ed8e7 -- cgit v1.2.3 From 7703b03cdde7ecb44ab6d3ea0e4c5d67f0f482de Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 19 Oct 2018 07:42:41 +0200 Subject: T913: add startup script for dhcpv6-relay --- .../includes.chroot/etc/init.d/isc-dhcpv6-relay | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-relay diff --git a/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-relay b/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-relay new file mode 100755 index 00000000..5a8ce620 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-relay @@ -0,0 +1,50 @@ +#!/bin/sh +# +# + +### BEGIN INIT INFO +# Provides: isc-dhcpv6-relay +# Required-Start: $remote_fs $network +# Required-Stop: $remote_fs $network +# Should-Start: $local_fs +# Should-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: IPv6 DHCP relay +# Description: Dynamic Host Configuration Protocol Relay for IPv6 +### END INIT INFO + +# It is not safe to start if we don't have a default configuration... +if [ ! -f /etc/default/isc-dhcpv6-relay ]; then + echo "/etc/default/isc-dhcpv6-relay does not exist! - Aborting..." + exit 1 +fi + +# Source init functions +. /lib/lsb/init-functions + +# Read init script configuration (interfaces the daemon should listen on +# and the DHCP server we should forward requests to.) +[ -f /etc/default/isc-dhcpv6-relay ] && . /etc/default/isc-dhcpv6-relay + +DHCRELAYPID=/var/run/dhcv6relay.pid + +case "$1" in + start) + start-stop-daemon --start --quiet --pidfile $DHCRELAYPID \ + --exec /usr/sbin/dhcrelay -- -q $OPTIONS -pf $DHCRELAYPID + ;; + stop) + start-stop-daemon --stop --quiet --pidfile $DHCRELAYPID + ;; + restart | force-reload) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "Usage: /etc/init.d/isc-dhcpv6-relay {start|stop|restart|force-reload}" + exit 1 +esac + +exit 0 -- cgit v1.2.3 From a91fea903de8f05f3faa36f0706c3e74fdb43ddb Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 19 Oct 2018 07:43:19 +0200 Subject: isc-dhcpv6-server init script naming cleanup --- .../includes.chroot/etc/init.d/isc-dhcpv6-server | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server b/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server index c7278416..12630719 100755 --- a/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server +++ b/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server @@ -3,15 +3,15 @@ # ### BEGIN INIT INFO -# Provides: isc-dhcp-server +# Provides: isc-dhcpv6-server # Required-Start: $remote_fs $network $syslog # Required-Stop: $remote_fs $network $syslog # Should-Start: $local_fs slapd $named # Should-Stop: $local_fs slapd # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: DHCP server -# Description: Dynamic Host Configuration Protocol Server +# Short-Description: IPv6 DHCP server +# Description: Dynamic Host Configuration Protocol Server for IPv6 ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -23,8 +23,7 @@ DHCPD_DEFAULT="${DHCPD_DEFAULT:-/etc/default/isc-dhcpv6-server}" # It is not safe to start if we don't have a default configuration... if [ ! -f "$DHCPD_DEFAULT" ]; then echo "$DHCPD_DEFAULT does not exist! - Aborting..." - if [ "$DHCPD_DEFAULT" = "/etc/default/isc-dhcp-server" ]; then - echo "Run 'dpkg-reconfigure isc-dhcp-server' to fix the problem." + if [ "$DHCPD_DEFAULT" = "/etc/default/isc-dhcpv6-server" ]; then fi exit 0 fi -- cgit v1.2.3 From c09d8e9ab4b862a5b9de5321c87621f530c072c1 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 20 Oct 2018 15:29:00 +0200 Subject: Add vyos-frr submodule --- .gitmodules | 3 +++ packages/vyos-frr | 1 + 2 files changed, 4 insertions(+) create mode 160000 packages/vyos-frr diff --git a/.gitmodules b/.gitmodules index 9bd70348..f0c9ea46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -142,3 +142,6 @@ [submodule "packages/vyos-strongswan"] path = packages/vyos-strongswan url = https://github.com/vyos/vyos-strongswan +[submodule "packages/vyos-frr"] + path = packages/vyos-frr + url = https://github.com/vyos/vyos-frr.git diff --git a/packages/vyos-frr b/packages/vyos-frr new file mode 160000 index 00000000..6ba5fb80 --- /dev/null +++ b/packages/vyos-frr @@ -0,0 +1 @@ +Subproject commit 6ba5fb8036f9155a3f724d43513e89ab8f07e8d5 -- cgit v1.2.3 From 8328f25bf5cb02db35b244ee3d6f3030671d0321 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 20 Oct 2018 15:33:27 +0200 Subject: T923: support SNMP integration with FRR routing daemon --- data/live-build-config/hooks/30-frr-configs.chroot | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/live-build-config/hooks/30-frr-configs.chroot b/data/live-build-config/hooks/30-frr-configs.chroot index b2a715d3..cc169fb5 100755 --- a/data/live-build-config/hooks/30-frr-configs.chroot +++ b/data/live-build-config/hooks/30-frr-configs.chroot @@ -31,11 +31,11 @@ bfdd=no daemons_conf = """ vtysh_enable=yes -zebra_options=" -s 90000000 --daemon -A 127.0.0.1 -n" -bgpd_options=" --daemon -A 127.0.0.1" -ospfd_options=" --daemon -A 127.0.0.1" -ospf6d_options=" --daemon -A ::1" -ripd_options=" --daemon -A 127.0.0.1" +zebra_options=" -s 90000000 --daemon -A 127.0.0.1 -M snmp -n" +bgpd_options=" --daemon -A 127.0.0.1 -M snmp" +ospfd_options=" --daemon -A 127.0.0.1 -M snmp" +ospf6d_options=" --daemon -A ::1 -M snmp" +ripd_options=" --daemon -A 127.0.0.1 -M snmp" ripngd_options=" --daemon -A ::1" isisd_options=" --daemon -A 127.0.0.1" pimd_options=" --daemon -A 127.0.0.1" -- cgit v1.2.3 From 7a16bfea780ab946a943fe031b012daf40119d8d Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Sun, 21 Oct 2018 17:53:01 +0200 Subject: Set the kernel to 4.14.65 for now. --- scripts/live-build-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/live-build-config b/scripts/live-build-config index 0af0f0c4..bd1029db 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -37,7 +37,7 @@ lb config noauto \ --architectures {{architecture}} \ --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay" \ --linux-flavours {{architecture}}-vyos \ - --linux-packages linux-image-4.18.11 \ + --linux-packages linux-image-4.14.65 \ --bootloader syslinux \ --binary-images iso-hybrid \ --debian-installer false \ -- cgit v1.2.3 From f83330c72c41a4e118f7ca162027e29b684205fb Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Sun, 21 Oct 2018 17:55:59 +0200 Subject: T718, T912, T911: add monitoring utilities (atop, htop, iotop). --- data/live-build-config/package-lists/vyos-utils.list.chroot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/live-build-config/package-lists/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot index ef9e994a..78ed5729 100644 --- a/data/live-build-config/package-lists/vyos-utils.list.chroot +++ b/data/live-build-config/package-lists/vyos-utils.list.chroot @@ -19,3 +19,6 @@ iftop lsof openssh-client haveged +htop +atop +iotop -- cgit v1.2.3 From d7b7f5a0440da862db7701f5135b68c9a9ec75b4 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Mon, 22 Oct 2018 00:59:33 +0200 Subject: Add Azure creation script --- Makefile | 3 +++ tools/cloud-init/99-walinuxagent.chroot | 17 +++++++++++++++++ tools/cloud-init/config.boot.default | 30 ++++++++++++++++++++++++++++++ tools/cloud-init/vyos-azure.list.chroot | 2 ++ 4 files changed, 52 insertions(+) create mode 100755 tools/cloud-init/99-walinuxagent.chroot create mode 100644 tools/cloud-init/config.boot.default create mode 100644 tools/cloud-init/vyos-azure.list.chroot diff --git a/Makefile b/Makefile index b2dc1f8b..f0af3ab3 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,9 @@ clearfog: clean prepare azure: clean prepare @set -e @echo "It's not like I'm building this specially for you or anything!" + cp tools/cloud-init/99-walinuxagent.chroot build/config/hooks/ + cp tools/cloud-init/vyos-azure.list.chroot build/config/package-lists/ + cp -f tools/cloud-init/config.boot.default build/config/includes.chroot/opt/vyatta/etc/ cd $(build_dir) @../scripts/build-azure-image diff --git a/tools/cloud-init/99-walinuxagent.chroot b/tools/cloud-init/99-walinuxagent.chroot new file mode 100755 index 00000000..f8848a2c --- /dev/null +++ b/tools/cloud-init/99-walinuxagent.chroot @@ -0,0 +1,17 @@ +#!/bin/sh + +echo I: Waagent / Cloud init + +# debug info: +#echo ForwardToConsole=yes >> /etc/systemd/journald.conf + +# dhcp issue on azure +sed -ie 's,rfc3442-classless-static-routes,disabled-\0,' /etc/dhcp/dhclient.conf + +rm -f /etc/ssh/ssh_host_* +rm -f /var/log/waagent.log +rm -r /var/cache/apt/* +rm -r /var/lib/apt/lists/* + +# prevent systemd message flooding +echo ':msg, contains, "Time has been changed" ~' > /etc/rsyslog.d/time_msgs.conf diff --git a/tools/cloud-init/config.boot.default b/tools/cloud-init/config.boot.default new file mode 100644 index 00000000..18f6ef09 --- /dev/null +++ b/tools/cloud-init/config.boot.default @@ -0,0 +1,30 @@ +system { + syslog { + global { + facility all { + level info + } + facility protocols { + level debug + } + } + } + ntp { + server "0.pool.ntp.org" + server "1.pool.ntp.org" + server "2.pool.ntp.org" + } + console { + device ttyS0 { + speed 9600 + } + } + config-management { + commit-revisions 100 + } +} + +interfaces { + loopback lo { + } +} diff --git a/tools/cloud-init/vyos-azure.list.chroot b/tools/cloud-init/vyos-azure.list.chroot new file mode 100644 index 00000000..91320a59 --- /dev/null +++ b/tools/cloud-init/vyos-azure.list.chroot @@ -0,0 +1,2 @@ +cloud-init +walinuxagent -- cgit v1.2.3 From f6c147b9ae7d2d62cf765c0b91514a052209b591 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Mon, 22 Oct 2018 15:01:58 +0200 Subject: Create dir needed for live-build to crete symlinks --- tools/cloud-init/99-walinuxagent.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/cloud-init/99-walinuxagent.chroot b/tools/cloud-init/99-walinuxagent.chroot index f8848a2c..1de525cf 100755 --- a/tools/cloud-init/99-walinuxagent.chroot +++ b/tools/cloud-init/99-walinuxagent.chroot @@ -11,6 +11,7 @@ sed -ie 's,rfc3442-classless-static-routes,disabled-\0,' /etc/dhcp/dhclient.conf rm -f /etc/ssh/ssh_host_* rm -f /var/log/waagent.log rm -r /var/cache/apt/* +mkdir -p /var/cache/apt/archives rm -r /var/lib/apt/lists/* # prevent systemd message flooding -- cgit v1.2.3 From 16cc9be3ba331216392e988f20183ab8c4eda0ce Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Tue, 23 Oct 2018 23:58:42 +0200 Subject: Separate files needed for different cloud providers Fix serial console speed settings Add google cloud image generation --- Makefile | 20 +++- scripts/build-GCE-image | 153 ++++++++++++++++++++++++++ scripts/build-azure-image | 6 +- tools/cloud-init/99-walinuxagent.chroot | 18 --- tools/cloud-init/GCE/90_dpkg.cfg | 2 + tools/cloud-init/GCE/config.boot.default | 30 +++++ tools/cloud-init/azure/99-walinuxagent.chroot | 18 +++ tools/cloud-init/azure/config.boot.default | 30 +++++ tools/cloud-init/azure/vyos-azure.list.chroot | 2 + tools/cloud-init/cloud-init.list.chroot | 1 + tools/cloud-init/config.boot.default | 30 ----- tools/cloud-init/vyos-azure.list.chroot | 2 - 12 files changed, 256 insertions(+), 56 deletions(-) create mode 100755 scripts/build-GCE-image delete mode 100755 tools/cloud-init/99-walinuxagent.chroot create mode 100644 tools/cloud-init/GCE/90_dpkg.cfg create mode 100644 tools/cloud-init/GCE/config.boot.default create mode 100755 tools/cloud-init/azure/99-walinuxagent.chroot create mode 100644 tools/cloud-init/azure/config.boot.default create mode 100644 tools/cloud-init/azure/vyos-azure.list.chroot create mode 100644 tools/cloud-init/cloud-init.list.chroot delete mode 100644 tools/cloud-init/config.boot.default delete mode 100644 tools/cloud-init/vyos-azure.list.chroot diff --git a/Makefile b/Makefile index f0af3ab3..f4a9ef29 100644 --- a/Makefile +++ b/Makefile @@ -82,12 +82,24 @@ clearfog: clean prepare azure: clean prepare @set -e @echo "It's not like I'm building this specially for you or anything!" - cp tools/cloud-init/99-walinuxagent.chroot build/config/hooks/ - cp tools/cloud-init/vyos-azure.list.chroot build/config/package-lists/ - cp -f tools/cloud-init/config.boot.default build/config/includes.chroot/opt/vyatta/etc/ + cp tools/cloud-init/azure/99-walinuxagent.chroot build/config/hooks/ + cp tools/cloud-init/azure/vyos-azure.list.chroot build/config/package-lists/ + cp -f tools/cloud-init/azure/config.boot.default build/config/includes.chroot/opt/vyatta/etc/ cd $(build_dir) @../scripts/build-azure-image +.PHONY: GCE +.ONESHELL: +GCE: clean prepare + @set -e + @echo "It's not like I'm building this specially for you or anything!" + mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d + cp tools/cloud-init/GCE/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/ + cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/ + cp -f tools/cloud-init/GCE/config.boot.default build/config/includes.chroot/opt/vyatta/etc/ + cd $(build_dir) + @../scripts/build-GCE-image + .PHONY: clean .ONESHELL: clean: @@ -101,6 +113,8 @@ clean: rm -f *.img rm -f *.xz rm -f *.vhd + rm -f *.raw + rm -f *.tar.gz .PHONY: purge purge: diff --git a/scripts/build-GCE-image b/scripts/build-GCE-image new file mode 100755 index 00000000..7684bd43 --- /dev/null +++ b/scripts/build-GCE-image @@ -0,0 +1,153 @@ +#!/bin/sh +# +# Copyright (C) 2018 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 or later as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# File: build-GCE-image +# Purpose: +# Build VyOS image for Google cloud. + +lb bootstrap + +lb chroot +lb installer +lb binary_chroot +lb chroot_devpts install +lb chroot_proc install +lb chroot_selinuxfs install +lb chroot_sysfs install +lb chroot_hosts install +lb chroot_resolv install +lb chroot_hostname install +lb chroot_sysv-rc install +lb chroot_upstart install +lb chroot_apt install-binary +lb chroot_archives chroot install +lb binary_rootfs +lb binary_manifest +lb binary_package-lists +lb binary_linux-image +lb binary_memtest +lb binary_grub +lb binary_grub2 +lb binary_syslinux +lb binary_disk +lb binary_loadlin +lb binary_win32-loader +lb binary_includes +lb binary_hooks +lb binary_checksums + +# get vyos build version +version=$(cat version) +dateymd=$(date +%Y%m%d) + +###################################### +### Prepare the HDD (format, ext.) ### +###################################### +PARTED=/sbin/parted +OUTPUT=disk.raw +OUTPUTGZ=VyOS-"$dateymd".tar.gz +IMAGE_SIZE=2 +qemu-img create -f raw ${OUTPUT} ${IMAGE_SIZE}G + +${PARTED} -s ${OUTPUT} mktable msdos +${PARTED} -s -a optimal ${OUTPUT} mkpart primary ext4 1Mi 100% +${PARTED} -s ${OUTPUT} set 1 boot on +RESULT_KPARTX=`kpartx -asv ${OUTPUT} 2>&1` + +if echo "${RESULT_KPARTX}" | grep "^add map" ; then + LOOP_DEVICE=$(echo ${RESULT_KPARTX} | cut -d" " -f3) + LOOPRAW_DEVICE=${LOOP_DEVICE%p*} + echo "kpartx mounted using: ${LOOP_DEVICE} via ${LOOPRAW_DEVICE}" +else + echo "It seems kpartx didn't mount the image correctly: exiting." + exit 1 +fi + +cleanup(){ + error=$? + [ ! -d "${MOUNT_DIR}" ] && return + if [ "$error" -gt 0 ]; then + echo + echo "Error $error" + else + echo "Finished." + fi + + set +e + + sync + umount -l ${MOUNT_DIR} + rmdir ${MOUNT_DIR} + + umount devpts-live + umount proc-live + umount sysfs-live + + dmsetup remove --deferred ${LOOP_DEVICE} + losetup -d /dev/${LOOPRAW_DEVICE} + exit $error +} +trap "cleanup" EXIT TERM INT + +mkfs.ext4 /dev/mapper/${LOOP_DEVICE} -L persistence +UUID=$(blkid -o value -s UUID /dev/mapper/${LOOP_DEVICE}) + +# No fsck because of X days without checks +tune2fs -i 0 /dev/mapper/${LOOP_DEVICE} + +MOUNT_DIR=`mktemp -d -t build-debimg.XXXXXX` +mount /dev/mapper/${LOOP_DEVICE} ${MOUNT_DIR} + +######################## +### Setting-up files ### +######################## +mkdir -p ${MOUNT_DIR}/boot/grub +mkdir -p ${MOUNT_DIR}/boot/"$version"/rw + +echo "/ union" > ${MOUNT_DIR}/persistence.conf +cp binary/live/filesystem.squashfs ${MOUNT_DIR}/boot/"$version"/"$version.squashfs" +cp binary/live/initrd.img ${MOUNT_DIR}/boot/"$version"/initrd.img +cp binary/live/vmlinuz ${MOUNT_DIR}/boot/"$version"/vmlinuz + +######################## +### Create grub menu ### +######################## +cat > ${MOUNT_DIR}/boot/grub/grub.cfg << EOF +set timeout=5 +set default=0 + +menuentry "VyOS $version (Serial console)" { + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,38400n8d earlyprintk=ttyS0,38400 consoleblank=0 systemd.show_status=true + initrd /boot/"$version"/initrd.img +} + +menuentry "Lost password change $version (Serial console)" { + linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,38400n8d earlyprintk=ttyS0,38400 consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset + initrd /boot/"$version"/initrd.img +} +EOF + + +############################# +### Setting-up bootloader ### +############################# +grub-install --boot-directory ${MOUNT_DIR}/boot --force --no-floppy --skip-fs-probe /dev/${LOOPRAW_DEVICE} + +################### +### HOOK SCRIPT ### +################### +fstrim ${MOUNT_DIR} +sync + +tar -Sczf ${OUTPUTGZ} ${OUTPUT} diff --git a/scripts/build-azure-image b/scripts/build-azure-image index d158fe89..d47b4351 100755 --- a/scripts/build-azure-image +++ b/scripts/build-azure-image @@ -12,7 +12,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# File: build-clearfog-image +# File: build-azure-image # Purpose: # Build VyOS image for Azure. @@ -127,12 +127,12 @@ set timeout=5 set default=0 menuentry "VyOS $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200 earlyprintk=ttyS0,115200 consoleblank=0 systemd.show_status=true + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 consoleblank=0 systemd.show_status=true initrd /boot/"$version"/initrd.img } menuentry "Lost password change $version (Serial console)" { - linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200 earlyprintk=ttyS0,115200 consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot/"$version"/vmlinuz boot=live quiet vyos-union=/boot/"$version" console=tty0 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 consoleblank=0 systemd.show_status=true init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot/"$version"/initrd.img } EOF diff --git a/tools/cloud-init/99-walinuxagent.chroot b/tools/cloud-init/99-walinuxagent.chroot deleted file mode 100755 index 1de525cf..00000000 --- a/tools/cloud-init/99-walinuxagent.chroot +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -echo I: Waagent / Cloud init - -# debug info: -#echo ForwardToConsole=yes >> /etc/systemd/journald.conf - -# dhcp issue on azure -sed -ie 's,rfc3442-classless-static-routes,disabled-\0,' /etc/dhcp/dhclient.conf - -rm -f /etc/ssh/ssh_host_* -rm -f /var/log/waagent.log -rm -r /var/cache/apt/* -mkdir -p /var/cache/apt/archives -rm -r /var/lib/apt/lists/* - -# prevent systemd message flooding -echo ':msg, contains, "Time has been changed" ~' > /etc/rsyslog.d/time_msgs.conf diff --git a/tools/cloud-init/GCE/90_dpkg.cfg b/tools/cloud-init/GCE/90_dpkg.cfg new file mode 100644 index 00000000..ac4ffeae --- /dev/null +++ b/tools/cloud-init/GCE/90_dpkg.cfg @@ -0,0 +1,2 @@ +# to update this file, run dpkg-reconfigure cloud-init +datasource_list: [ GCE ] diff --git a/tools/cloud-init/GCE/config.boot.default b/tools/cloud-init/GCE/config.boot.default new file mode 100644 index 00000000..a0cc398f --- /dev/null +++ b/tools/cloud-init/GCE/config.boot.default @@ -0,0 +1,30 @@ +system { + syslog { + global { + facility all { + level info + } + facility protocols { + level debug + } + } + } + ntp { + server "0.pool.ntp.org" + server "1.pool.ntp.org" + server "2.pool.ntp.org" + } + console { + device ttyS0 { + speed 38400 + } + } + config-management { + commit-revisions 100 + } +} + +interfaces { + loopback lo { + } +} diff --git a/tools/cloud-init/azure/99-walinuxagent.chroot b/tools/cloud-init/azure/99-walinuxagent.chroot new file mode 100755 index 00000000..1de525cf --- /dev/null +++ b/tools/cloud-init/azure/99-walinuxagent.chroot @@ -0,0 +1,18 @@ +#!/bin/sh + +echo I: Waagent / Cloud init + +# debug info: +#echo ForwardToConsole=yes >> /etc/systemd/journald.conf + +# dhcp issue on azure +sed -ie 's,rfc3442-classless-static-routes,disabled-\0,' /etc/dhcp/dhclient.conf + +rm -f /etc/ssh/ssh_host_* +rm -f /var/log/waagent.log +rm -r /var/cache/apt/* +mkdir -p /var/cache/apt/archives +rm -r /var/lib/apt/lists/* + +# prevent systemd message flooding +echo ':msg, contains, "Time has been changed" ~' > /etc/rsyslog.d/time_msgs.conf diff --git a/tools/cloud-init/azure/config.boot.default b/tools/cloud-init/azure/config.boot.default new file mode 100644 index 00000000..296c690a --- /dev/null +++ b/tools/cloud-init/azure/config.boot.default @@ -0,0 +1,30 @@ +system { + syslog { + global { + facility all { + level info + } + facility protocols { + level debug + } + } + } + ntp { + server "0.pool.ntp.org" + server "1.pool.ntp.org" + server "2.pool.ntp.org" + } + console { + device ttyS0 { + speed 115200 + } + } + config-management { + commit-revisions 100 + } +} + +interfaces { + loopback lo { + } +} diff --git a/tools/cloud-init/azure/vyos-azure.list.chroot b/tools/cloud-init/azure/vyos-azure.list.chroot new file mode 100644 index 00000000..91320a59 --- /dev/null +++ b/tools/cloud-init/azure/vyos-azure.list.chroot @@ -0,0 +1,2 @@ +cloud-init +walinuxagent diff --git a/tools/cloud-init/cloud-init.list.chroot b/tools/cloud-init/cloud-init.list.chroot new file mode 100644 index 00000000..db064e62 --- /dev/null +++ b/tools/cloud-init/cloud-init.list.chroot @@ -0,0 +1 @@ +cloud-init diff --git a/tools/cloud-init/config.boot.default b/tools/cloud-init/config.boot.default deleted file mode 100644 index 18f6ef09..00000000 --- a/tools/cloud-init/config.boot.default +++ /dev/null @@ -1,30 +0,0 @@ -system { - syslog { - global { - facility all { - level info - } - facility protocols { - level debug - } - } - } - ntp { - server "0.pool.ntp.org" - server "1.pool.ntp.org" - server "2.pool.ntp.org" - } - console { - device ttyS0 { - speed 9600 - } - } - config-management { - commit-revisions 100 - } -} - -interfaces { - loopback lo { - } -} diff --git a/tools/cloud-init/vyos-azure.list.chroot b/tools/cloud-init/vyos-azure.list.chroot deleted file mode 100644 index 91320a59..00000000 --- a/tools/cloud-init/vyos-azure.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -cloud-init -walinuxagent -- cgit v1.2.3 From a0cdf15c5e65160cf2e56b1658cab11146109a11 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Thu, 25 Oct 2018 14:15:34 +0200 Subject: Add build command for AWS --- Makefile | 14 ++++++++++++++ tools/cloud-init/AWS/90_dpkg.cfg | 2 ++ tools/cloud-init/AWS/config.boot.default | 30 ++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 tools/cloud-init/AWS/90_dpkg.cfg create mode 100644 tools/cloud-init/AWS/config.boot.default diff --git a/Makefile b/Makefile index f4a9ef29..b0904772 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,20 @@ GCE: clean prepare cd $(build_dir) @../scripts/build-GCE-image +.PHONY: AWS +.ONESHELL: +AWS: clean prepare + @set -e + @echo "It's not like I'm building this specially for you or anything!" + mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d + cp tools/cloud-init/AWS/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/ + cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/ + cp -f tools/cloud-init/AWS/config.boot.default build/config/includes.chroot/opt/vyatta/etc/ + cd $(build_dir) + lb build 2>&1 | tee build.log + cd .. + @scripts/copy-image + .PHONY: clean .ONESHELL: clean: diff --git a/tools/cloud-init/AWS/90_dpkg.cfg b/tools/cloud-init/AWS/90_dpkg.cfg new file mode 100644 index 00000000..1bf7d288 --- /dev/null +++ b/tools/cloud-init/AWS/90_dpkg.cfg @@ -0,0 +1,2 @@ +# to update this file, run dpkg-reconfigure cloud-init +datasource_list: [ Ec2 ] diff --git a/tools/cloud-init/AWS/config.boot.default b/tools/cloud-init/AWS/config.boot.default new file mode 100644 index 00000000..18f6ef09 --- /dev/null +++ b/tools/cloud-init/AWS/config.boot.default @@ -0,0 +1,30 @@ +system { + syslog { + global { + facility all { + level info + } + facility protocols { + level debug + } + } + } + ntp { + server "0.pool.ntp.org" + server "1.pool.ntp.org" + server "2.pool.ntp.org" + } + console { + device ttyS0 { + speed 9600 + } + } + config-management { + commit-revisions 100 + } +} + +interfaces { + loopback lo { + } +} -- cgit v1.2.3 From 71d623672498d5c2d94ef7bac66c02e3376d8cb8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 25 Oct 2018 20:22:17 +0200 Subject: isc-dhcpv6-server: bugfix empty if; then fi clause commit a91fea903 ("isc-dhcpv6-server init script naming cleanup") introduced an empty if; then fi clause which produces a BASH syntax error. --- data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server b/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server index 12630719..441827d5 100755 --- a/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server +++ b/data/live-build-config/includes.chroot/etc/init.d/isc-dhcpv6-server @@ -23,8 +23,6 @@ DHCPD_DEFAULT="${DHCPD_DEFAULT:-/etc/default/isc-dhcpv6-server}" # It is not safe to start if we don't have a default configuration... if [ ! -f "$DHCPD_DEFAULT" ]; then echo "$DHCPD_DEFAULT does not exist! - Aborting..." - if [ "$DHCPD_DEFAULT" = "/etc/default/isc-dhcpv6-server" ]; then - fi exit 0 fi -- cgit v1.2.3 From 8329b79b82de84c34b5fd39692fa00cf59c230f5 Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Sat, 27 Oct 2018 17:45:23 +0200 Subject: Add packages needed to build Azure image --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0151ae20..62a5bd42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,12 @@ RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' | tee -a /etc/ libperl-dev \ libnfnetlink-dev \ python3-git \ + parted \ + kpartx \ + grub-common \ + grub-pc \ + grub-pc-bin \ + grub2-common \ jq \ qemu-system-x86 \ qemu-utils \ -- cgit v1.2.3 From 4d16dbead89c44aca5bcc91981a98572b9c15f16 Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Sat, 27 Oct 2018 18:01:49 +0200 Subject: remove grub packages --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62a5bd42..3f44b976 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,6 @@ RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' | tee -a /etc/ python3-git \ parted \ kpartx \ - grub-common \ - grub-pc \ - grub-pc-bin \ - grub2-common \ jq \ qemu-system-x86 \ qemu-utils \ -- cgit v1.2.3