From 7492e273834b4aa01712b16d8229fd9f91019c89 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 25 Apr 2019 16:18:14 +0200
Subject: VyOS 1.3.0 is based on Debian Buster
---
data/defaults.json | 8 ++------
data/versions | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
(limited to 'data')
diff --git a/data/defaults.json b/data/defaults.json
index 2699b789..bddc75f1 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -2,15 +2,11 @@
"architecture": "amd64",
"debian_mirror": "http://deb.debian.org/debian",
"debian_security_mirror": "http://deb.debian.org/debian-security",
- "debian_distribution": "jessie",
+ "debian_distribution": "buster",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
"vyos_branch": "current",
"kernel_version": "4.19.36",
"kernel_flavor": "amd64-vyos",
- "additional_repositories": [
- "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main",
- "deb http://repo.powerdns.com/debian jessie-rec-41 main",
- "deb http://archive.debian.org/debian/ jessie-backports main"
- ],
+ "additional_repositories": [],
"custom_packages": []
}
diff --git a/data/versions b/data/versions
index 3d0c2871..6b068aa7 100644
--- a/data/versions
+++ b/data/versions
@@ -1,3 +1,3 @@
{
- "current": "1.2.0"
+ "current": "1.3.0"
}
--
cgit v1.2.3
From b65c43cd718f1775990c9ca70647e8b0360e4728 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 26 Apr 2019 18:49:11 +0200
Subject: Build: use proper versions depnding on Git branches
---
data/versions | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/versions b/data/versions
index 6b068aa7..868d21cb 100644
--- a/data/versions
+++ b/data/versions
@@ -1,3 +1,4 @@
{
- "current": "1.3.0"
+ "buster": "1.3.0",
+ "current": "1.2.0"
}
--
cgit v1.2.3
From 7965820b8581989e88120efc689f52bf703dccc0 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 1 May 2019 23:53:19 +0200
Subject: Utils: replace netcat(6) with netcat-openbsd
Debian Buster does no longer provide packages like netcat and netcat6
---
data/live-build-config/package-lists/vyos-utils.list.chroot | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'data')
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 cc28e9b7..8c0a8cd4 100644
--- a/data/live-build-config/package-lists/vyos-utils.list.chroot
+++ b/data/live-build-config/package-lists/vyos-utils.list.chroot
@@ -4,8 +4,7 @@ ipcalc
sipcalc
mtr-tiny
whois
-netcat
-netcat6
+netcat-openbsd
socat
telnet
nano
--
cgit v1.2.3
From 5eca417ff33caefd752ae9fff20ff0581fa6f918 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 1 May 2019 23:56:15 +0200
Subject: Build: use VyOS version 1.3 for branch equuleus
---
data/versions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/versions b/data/versions
index 868d21cb..5cbb0ad3 100644
--- a/data/versions
+++ b/data/versions
@@ -1,4 +1,4 @@
{
- "buster": "1.3.0",
+ "equuleus": "1.3.0",
"current": "1.2.0"
}
--
cgit v1.2.3
From 4294fd325008b8024a477664b5c993ac9c89eb6e Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Tue, 28 May 2019 22:36:33 +0200
Subject: T1412, T1413: remove non installable paclage vyos-xe-guest-utilities
and vyos-netplug
These packages is for now not installable in buster and breaks the live-build process
---
data/package-lists/vyos-x86.list.chroot | 2 --
1 file changed, 2 deletions(-)
(limited to 'data')
diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot
index 6f5d7624..e107534c 100644
--- a/data/package-lists/vyos-x86.list.chroot
+++ b/data/package-lists/vyos-x86.list.chroot
@@ -2,5 +2,3 @@ grub2
grub-pc
qemu-guest-agent
hyperv-daemons
-vyos-xe-guest-utilities
-vyos-netplug
--
cgit v1.2.3
From 1850f165abda3f3d0498220e56ca594dc8ecca9c Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Tue, 28 May 2019 22:51:06 +0200
Subject: T1414: disable failing 10-unmountfs.chroot and needs verification
---
data/live-build-config/hooks/live/10-unmountfs.chroot | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/10-unmountfs.chroot b/data/live-build-config/hooks/live/10-unmountfs.chroot
index 7992a4d2..05bcc12c 100755
--- a/data/live-build-config/hooks/live/10-unmountfs.chroot
+++ b/data/live-build-config/hooks/live/10-unmountfs.chroot
@@ -1,5 +1,5 @@
#!/bin/sh
-
+exit 0
# hack umountfs script to cleanly unmount live systems
sed \
--
cgit v1.2.3
From 1109c04fec9a201d3cb321ab5eb4d5b496eac540 Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Tue, 28 May 2019 22:57:46 +0200
Subject: T1415: disable 24-efi_packages.chroot as it fails apply'ing by
live-build
The package grub-efi and grub-efi-amd64 is not existant on buster
---
data/live-build-config/hooks/live/24-efi_packages.chroot | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/24-efi_packages.chroot b/data/live-build-config/hooks/live/24-efi_packages.chroot
index c2b1ff11..49bc6ebb 100755
--- a/data/live-build-config/hooks/live/24-efi_packages.chroot
+++ b/data/live-build-config/hooks/live/24-efi_packages.chroot
@@ -1,5 +1,5 @@
#!/bin/sh
-
+exit 0
echo I: Download grub-efi packages.
mkdir -p /usr/share/vyos/packages
--
cgit v1.2.3
From 3da6afd6a521ee1d55607a4a015be1696ea9ff0a Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Thu, 20 Jun 2019 09:39:35 +0200
Subject: T1413: T1412: compilation of netplug and xe-guest-utilities is now
fixed in equuleus
---
data/package-lists/vyos-x86.list.chroot | 2 ++
scripts/build-packages | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'data')
diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot
index e107534c..8e2b8692 100644
--- a/data/package-lists/vyos-x86.list.chroot
+++ b/data/package-lists/vyos-x86.list.chroot
@@ -2,3 +2,5 @@ grub2
grub-pc
qemu-guest-agent
hyperv-daemons
+vyos-netplug
+vyos-xe-guest-utilities
diff --git a/scripts/build-packages b/scripts/build-packages
index 2d33708f..9d94ca12 100755
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -177,8 +177,6 @@ vyos_packages = ['vyatta-bash',
'vyos-world',
'vyatta-iproute',
'vyos-vmwaretools-scripts',
- 'vyos-netplug',
- 'vyos-xe-guest-utilities',
'vyatta-biosdevname',
'vyos-opennhrp',
'vyos-salt-minion',
@@ -198,6 +196,8 @@ pkg_special.append( add_package('ipaddrcheck', branch='master'))
pkg_special.append( add_package('vyos-1x', branch='equuleus'))
pkg_special.append( add_package('vyatta-conntrack', branch='equuleus'))
pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus'))
+pkg_special.append( add_package('vyos-xe-guest-utilities', branch='equuleus'))
+pkg_special.append( add_package('vyos-netplug', branch='equuleus'))
# Packages where we directly build the upstream source
pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') )
--
cgit v1.2.3
From 3c9071dcc1ed48cbbcae26d967eaef8763210482 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Tue, 30 Jul 2019 09:03:37 -0400
Subject: Adjustments for the new equuleus repository.
---
data/defaults.json | 4 +-
.../live-build-config/archives/vyos-dev.key.chroot | 77 +++++++++++------
.../archives/vyos-release.key.chroot | 99 +++++++++++-----------
scripts/live-build-config | 5 +-
4 files changed, 102 insertions(+), 83 deletions(-)
(limited to 'data')
diff --git a/data/defaults.json b/data/defaults.json
index 5e6515d9..964e5da9 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -3,8 +3,8 @@
"debian_mirror": "http://deb.debian.org/debian",
"debian_security_mirror": "http://deb.debian.org/debian-security",
"debian_distribution": "buster",
- "vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
- "vyos_branch": "current",
+ "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus",
+ "vyos_branch": "equuleus",
"kernel_version": "4.19.54",
"kernel_flavor": "amd64-vyos",
"additional_repositories": [],
diff --git a/data/live-build-config/archives/vyos-dev.key.chroot b/data/live-build-config/archives/vyos-dev.key.chroot
index a6522e36..9f306a91 100644
--- a/data/live-build-config/archives/vyos-dev.key.chroot
+++ b/data/live-build-config/archives/vyos-dev.key.chroot
@@ -1,32 +1,53 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
+Version: GnuPG v2.0.22 (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
+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
+FhyPysWJ4aNKtAYgVuQguPTt
+=rJUC
-----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
index ff47c683..9f306a91 100644
--- a/data/live-build-config/archives/vyos-release.key.chroot
+++ b/data/live-build-config/archives/vyos-release.key.chroot
@@ -1,52 +1,53 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
-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
-8vzPzaWHhkOkU8/J/Ci7+vNtUOZb
-=Ld8S
+mQINBF0/MrsBEADLSj4PdgHsr4FblWqQmmZD32J3EVlXrBIwi0zT1RN6V6vA81xx
+Qe8XNm6LXVB9kjH9Qv+MwIWWOkTYGCDg2oiIAKPRnJfKisDo4Ax3a1j2YOF6Ud2n
+t1bdDfSvnMnEITnMwa+BHKx3QeBoVG/8zhMeHjXy0QwHUIdKMyrX8M0JWY/sqLlv
+HvzEaB3PEMFGFhuJ3Dh/ZxquVVuSS2GPRyTpLTqrPSH9jG8hf8YFWBE+CHbnclZc
+4NKlI5Q5yrqrUE7zGWgg3O75o6xlJpjI2TJXPPYU6llCNQi/AUIB3R34okMdyYmP
+dzaHBXeA+a5glikv5i0ysJgfZ/hvZgayZdAvqIxQxjzvKebmqUutay7LhgjKGRnC
+vdAAQ1LbkqPvbBN1oaElRiTUR6bekTFd/M8x3DWPHc0xkNps6f4sEoiFkujpsl26
+uGlBhf59yFzI/XhjT/04pUWa3myFhGWT4WSw8cf3o/47/CiL4TefOBTY2vSSub7V
+nekDG6H75i9szMMQGzry71+RzYMOWkUnnnQ6wjpHuce42zU7wKUdl2+Wrr+g2/cK
+NKFvHRmGLVOpcabDawWi08hHr+J6Gje9PCePfY4x0p6Idjz5YW4Q1D/XSDZZ3nni
+akhMO1onHLolY7jstdexhSSi7nS9bDAdnHlL7e/hJemF5G0IvLlkaXYIpQARAQAB
+tDJWeU9TIG1haW50YWluZXJzIChwYWNrYWdlIHNpZ25pbmcpIDxwa2dzQHZ5b3Mu
+bmV0PokCOQQTAQIAIwUCXT8yuwIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheA
+AAoJELK9zt4uv5wGFk4P/3MUhejAJrkMy8EC21P74yCxpZ8RfahML/hIy8+13mWd
+480eSGrZr+mEk7pN4T+5cOV4gO9gsKlZ+9zvP8PjRqrHhdDWnA+6GZSMmwvV5C+s
+DDop3Wa5z6u5SXwultAEzssNtmVreXhGrB/gkpx6NsAZz9TbwVCOyfFu5di2Oued
+ItL6IhkLBIbOmJX1X5CD3AvXIKcRwp7L3mFYP+UE5/c3OFmIK5P1J3vvHRPQqHls
+BOPs7dMowfCQfNTUyUWTG74gPo9wHCnuE6QnO5b/j1dPKgz5058bK+NMFgLLdw6X
+pb8Z7CvQPSLr5o2KfP+LsC7Nyz4tFQukJvidZdQ/uYQ38SDXsLbmlqnQWDCtYMzu
+j225frdkvymwvLrroVWGfbJI2Bd+u3VoQmLdMdddnSe/+oKoh2/xBueWH/O6d4F4
+br+HNbhxaxhhM2JuPXB7mQTDyzl4RhD8JixV6YgjWo1/X8wfpJdB/utTbiwLdhIH
+q2gdI3sxDCikapQWEhHWAgW4azhzXXvo8RTwNWXtck2DBsQxsn4lANvcWwJ7fRD5
+FDgIcJJ+rZrA9NT1sihSjxvUWAmByOSWwdWQRm8O86tFjqm9mJ5ppIYLX5weMa6L
+przxbm85y5DZeeuxo297YHGbrfeRm7ko/yB+DFdnLirnblK5JI4RL94AwZjad879
+uQINBF0/MrsBEACmKylWG6GC+EPn+x01vA3tVDyyDcOxaRevCvCYEINv7yn7Ajc3
+ZaWqqNRfZheOU5hUVJjW6cv7xqaWIn9J/7vatmdeX8H1cVWpSk/e1QT1Fop7I71e
+4skDn8YI6JIZgFBrqe1O3YHOQDZbMO9zR5jNpVD7XXLyGsRvjnkH/ybugBeiVCqt
+7x2I8OnDQggFnBrishMjVrEmBAduE3JICC1IbCCtVG67h07E/BC7XJVgME8Hvfwl
+EBTo8Y6CWcrsJZfAQKU+3wi5feFVLIbhNceiGcxmi7uJML+hGoSf92Pmn7i9p5su
+ywy4XF+aWvd4R3CMYywOiukB3rItic7gp0tpcMK7AwessGqvD/luz2cNY1IqDKak
+w7jGbGUT54zKO3tpt73dYGyf3SUHQ9aNAaGuSxjq/c9v9X4KpzmAi82rt4wSkDVa
+/5SkxsU9aP6lql2MrZm//Pj3hjyipTLUFhndbjeJDgBRROMJdokNkFIIaweJGAg2
+wNwBC6HRIYXLyOsV+Azf1gqSpCEqdKVLJkBduuChtd7N9xoUahag2yya+ujwpcN6
+nlmnhZt+yfgi0uO2cPmsof9PkJi+cb44IAgkvG96Zj2JbLHSlGipyYTHLYS46RC4
+CkaF3DSwDXVU+lBqJz+WkOywpMGUKtZwPbpy7ZJVf2JL8Rf0D95sIaeICwARAQAB
+iQIfBBgBAgAJBQJdPzK7AhsMAAoJELK9zt4uv5wG45IP/2YEQzyn2qiqHInLEmXE
+R7fefmkiTy925juASQiR/LGOCSfCOnMKBMkyi63XvQuhAALU6RxgK69yLZJYWQ+a
+gh+vrrndCzprCM4PohuupknA8nAY+FvC5xoOZVkZ/+vUP344ukxN9Fz1d9oU3G5a
+luoA23G1qs7kHJw/xzN1BFNqie2mIzMAOI0Wu0BZxmYmD3Ph0KMbUD08jX6ImDF6
+EnqS0VhCgXfWhPBqh5TOG35Fi5ZCmupbgqBJQZg5fLIWS3Hk2qBm70FR3iLdjiYu
+w165hBlqcJ2YfvVBKVvMNRVB9BtF7BfzCM3/y/4V82EZ7qQJ+jE30N+/vwrAOrUd
+QVlFsC5eYDOkRb3XXhijXZhoKoeXTwY7TGNntavVMYZ2W4EFoX2OH8/2A7KEYhqc
+3cjEJ7EoM6hkmm6xmU82oQ8Moll1SgQbkNKlZYDPMs7Ppr4zBJjnVYVcP9e1RLFO
+0POJbtG7CCAstcvMu/3Yw7Il/TOGvc3TNBPrkYtriDj+B900W5sEc33iUV9VRAAi
+Bkfs0XMSQVIcMdquu2LGfNWBjd/YCZVQ8OzFYoZJeq18oxeZ9/tE4NE3KyUBmqil
+5/WicCYtxgxByAvhN5dFn+nPfoEMQ/e9Zhs2ImrrSy12Ehg1swRjAK39NrjySDFT
+FhyPysWJ4aNKtAYgVuQguPTt
+=rJUC
-----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 9855467d..7a253557 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -68,19 +68,16 @@ debug = build_config['debug']
# Add the additional repositories to package lists
print("Setting up additional APT entries")
-vyos_repo_entry = "deb {0}/vyos {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])
-vyos_debian_repo_entry = "deb {0}/debian {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])
+vyos_repo_entry = "deb {0} {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])
apt_file = os.path.join(build_config['build_dir'], defaults.VYOS_REPO_FILE)
if debug:
print("Adding these entries to {0}:".format(apt_file))
print("\t", vyos_repo_entry)
- print("\t", vyos_debian_repo_entry)
with open(apt_file, 'w') as f:
f.write(vyos_repo_entry)
- f.write(vyos_debian_repo_entry)
# Add custom APT entries
if build_config['custom_apt_entry']:
--
cgit v1.2.3
From 1b3c234f214767df6e7208576fb9ab52e8ec9151 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Fri, 20 Sep 2019 18:44:49 -0500
Subject: T1676: [equuleus] buster: update GRUB boot parameters during upgrade
---
.../includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'data')
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 516b8b78..8441cb41 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 rootdelay=5 vyos-union=/boot/ console=ttyS0,115200 console=tty0
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=ttyS0,115200 console=tty0
initrd /boot//initrd.img
}
menuentry "VyOS (Serial console)" {
- linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,115200
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=tty0 console=ttyS0,115200
initrd /boot//initrd.img
}
menuentry "Lost password change (KVM console)" {
- linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,115200 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=ttyS0,115200 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 rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset
+ linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset
initrd /boot//initrd.img
}
--
cgit v1.2.3
From 1ff1b22726f1f4678dca8295860623d728e20521 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Tue, 8 Oct 2019 11:29:50 -0700
Subject: systemd-services: disable pacemaker, corosync, wpa_supplicant, squid
- dusable their autostart at boot time via systemd defaults
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 0caed88a..93e413d0 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -39,5 +39,10 @@ systemctl disable strongswan.service
systemctl disable frr.service
systemctl disable salt-minion.service
systemctl disable nginx.service
+systemctl disable pacemaker.service
+systemctl disable corosync.service
+systemctl disable wpa_supplicant.service
+systemctl disable squid.service
+
systemctl enable vyos-hostsd.service
--
cgit v1.2.3
From 29147950487514dd34fa486a5d1d42412a90ce43 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Tue, 8 Oct 2019 14:40:36 -0700
Subject: systemd-disable - heartbeat.service disabled
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 93e413d0..42fb3020 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -43,6 +43,7 @@ systemctl disable pacemaker.service
systemctl disable corosync.service
systemctl disable wpa_supplicant.service
systemctl disable squid.service
+systemctl disable heartbeat.service
systemctl enable vyos-hostsd.service
--
cgit v1.2.3
From c293b710ab331612ec714c89abb286e0f7c6b7d1 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Fri, 11 Oct 2019 13:02:30 -0700
Subject: acpid: enable acpid to enable power button triggered shutdowns
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 42fb3020..fc6d2b76 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -47,3 +47,4 @@ systemctl disable heartbeat.service
systemctl enable vyos-hostsd.service
+systemctl enable acpid.service
--
cgit v1.2.3
From 87f3fa05fb1cf9cb9c9f8d583fd3a86f99d61293 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Mon, 21 Oct 2019 12:17:21 -0700
Subject: Kernel: update to 4.19.76 in defaults.json
---
data/defaults.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/defaults.json b/data/defaults.json
index a8b8e8d3..8714a470 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
"debian_distribution": "buster",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus",
"vyos_branch": "equuleus",
- "kernel_version": "4.19.67",
+ "kernel_version": "4.19.79",
"kernel_flavor": "amd64-vyos",
"additional_repositories": [],
"custom_packages": []
--
cgit v1.2.3
From 4b61416f466846f5dfedd4194a1d6a7f590b9850 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Mon, 21 Oct 2019 12:24:43 -0700
Subject: kernel-version: fixing typo
---
data/defaults.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/defaults.json b/data/defaults.json
index 8714a470..636c1476 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
"debian_distribution": "buster",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus",
"vyos_branch": "equuleus",
- "kernel_version": "4.19.79",
+ "kernel_version": "4.19.76",
"kernel_flavor": "amd64-vyos",
"additional_repositories": [],
"custom_packages": []
--
cgit v1.2.3
From bbf03fbde865234082637681c34f1904f980a32c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 10 Nov 2019 13:20:22 +0100
Subject: Kernel: T1791: update to Linux 4.19.82
(cherry picked from commit d68054f2930ea410ef04a4c24a938e9021307004)
---
data/defaults.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/defaults.json b/data/defaults.json
index 636c1476..b7f9ebcd 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
"debian_distribution": "buster",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus",
"vyos_branch": "equuleus",
- "kernel_version": "4.19.76",
+ "kernel_version": "4.19.82",
"kernel_flavor": "amd64-vyos",
"additional_repositories": [],
"custom_packages": []
--
cgit v1.2.3
From 9986845896f64f6a3b5556519fb26b678b59d1be Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 11 Nov 2019 16:39:40 +0100
Subject: hooks: synchronize Linux Firmware with current branch
Imported from commit 2382c90dc7a30d17628a11f9ff41f8c63867887a
---
.../hooks/live/40-linux-firmware.chroot | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot
index cd944faf..d3f34dec 100755
--- a/data/live-build-config/hooks/live/40-linux-firmware.chroot
+++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot
@@ -2,15 +2,22 @@
# To get the possibility of reproducible builds we pin to a specific commit
# of the linux-firmware repository
-COMMIT="7bc246451318b3536d9bfd3c4e46d541a9831b33"
+COMMIT="aa95e90b2c638f1ca6647d12b2d1b18284428f9c"
-echo I: Retrieving Linux Firmware - commit ${COMMIT}
+echo "I: Retrieving Linux Firmware - commit ${COMMIT}"
-curl -o /tmp/linux-firmware-${COMMIT}.tar.gz \
- https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz
-tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib
-mv /lib/linux-firmware-${COMMIT} /lib/firmware
-rm -f /tmp/linux-firmware-${COMMIT}.tar.gz
+ret=$(curl -w "%{http_code}" -o /tmp/linux-firmware-${COMMIT}.tar.gz \
+ https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz)
+
+if [ "${ret}" != "200" ]; then
+ echo E: Received HTTP error code \"${ret}\" when downloading Linux Firmware ...
+ exit 1
+fi
+
+tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /tmp
+mkdir -p /lib/firmware
+mv /tmp/linux-firmware-${COMMIT}/* /lib/firmware
+rm -rf /tmp/linux-firmware-${COMMIT}*
# We do not need all firmware blobs .. cleanup
RM_FIRMWARE=" \
--
cgit v1.2.3
From 932bc30211d7351324f6fe25a63087de0fb6914f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 12 Nov 2019 22:12:46 +0100
Subject: Kernel: T1800: update to Linux 4.19.84
(cherry picked from commit 460dbeaa04213d722ea95069eca82be8edb345de)
---
data/defaults.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'data')
diff --git a/data/defaults.json b/data/defaults.json
index b7f9ebcd..ff02384c 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
"debian_distribution": "buster",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus",
"vyos_branch": "equuleus",
- "kernel_version": "4.19.82",
+ "kernel_version": "4.19.84",
"kernel_flavor": "amd64-vyos",
"additional_repositories": [],
"custom_packages": []
--
cgit v1.2.3
From af920bd3be793e27d5460deb693ae14d42e246fa Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Fri, 29 Nov 2019 09:24:23 -0800
Subject: syslog: T1834: 'del system syslog' doesn't stop rsyslog
- disbled autostart at boot via systemd
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 ++
1 file changed, 2 insertions(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index fc6d2b76..54f1fa5c 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -44,6 +44,8 @@ systemctl disable corosync.service
systemctl disable wpa_supplicant.service
systemctl disable squid.service
systemctl disable heartbeat.service
+systemctl disable syslog.socket
+systemctl disable rsyslog.service
systemctl enable vyos-hostsd.service
--
cgit v1.2.3
From 672cff5ebf2a61ed5bc075fcab03a806d3c1139c Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Fri, 29 Nov 2019 11:05:27 -0800
Subject: syslog: T1834: 'del system syslog' doesn't stop rsyslog
- disable syslog.socket unit is not required, it's no service
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 -
1 file changed, 1 deletion(-)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 54f1fa5c..4ae8d478 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -44,7 +44,6 @@ systemctl disable corosync.service
systemctl disable wpa_supplicant.service
systemctl disable squid.service
systemctl disable heartbeat.service
-systemctl disable syslog.socket
systemctl disable rsyslog.service
--
cgit v1.2.3
From 2a5c58f4d0624243cbcc1a8070bd5446da948aba Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Fri, 29 Nov 2019 12:17:08 -0800
Subject: rsyslog: disabling rsyslog causes start issues if required
- socket.service can be found since disabling rsyslog removes
the link to socket.service too and causes a dependency error
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 --
1 file changed, 2 deletions(-)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 4ae8d478..b726bc3a 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -44,8 +44,6 @@ systemctl disable corosync.service
systemctl disable wpa_supplicant.service
systemctl disable squid.service
systemctl disable heartbeat.service
-systemctl disable rsyslog.service
-
systemctl enable vyos-hostsd.service
systemctl enable acpid.service
--
cgit v1.2.3
From dc9051e57c486041e6eeb07195b2b7a6e67f727a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 2 Dec 2019 20:07:01 +0100
Subject: ndisc6: add ICMPv6 Neighbor Discovery tool
(cherry picked from commit 3206c774c70dc87aaf7301b111f82df8d897bb12)
---
data/live-build-config/package-lists/vyos-utils.list.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
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 ee2073fb..5de95816 100644
--- a/data/live-build-config/package-lists/vyos-utils.list.chroot
+++ b/data/live-build-config/package-lists/vyos-utils.list.chroot
@@ -27,3 +27,4 @@ bgpq3
libnss-myhostname
ssl-cert
nginx-light
+ndisc6
--
cgit v1.2.3
From a276c3e7f9b4cb913e240c71ac13c1213a6a38bb Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 2 Dec 2019 20:18:48 +0100
Subject: systemd: apt: disable daily update service
As VyOS does not make use of APT for updating the system it is useless
to run this service.
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index b726bc3a..511b45df 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -44,6 +44,10 @@ systemctl disable corosync.service
systemctl disable wpa_supplicant.service
systemctl disable squid.service
systemctl disable heartbeat.service
+systemctl disable apt-daily.service
+systemctl disable apt-daily.timer
+systemctl disable apt-daily-upgrade.timer
+systemctl disable apt-daily-upgrade.service
systemctl enable vyos-hostsd.service
systemctl enable acpid.service
--
cgit v1.2.3
From baf8e096afcb7781997c2a1d5ec2058218eb1ba9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 2 Dec 2019 20:30:25 +0100
Subject: systemd: pcscd: disable SmartCard service
PCSC is included via a dependency of wpa_supplicant.
vyos@vyos:~$ apt-cache rdepends pcscd
pcscd
Reverse Depends:
libpcsclite1
opensc
libpcsclite1
vyos@vyos:~$ apt-cache rdepends libpcsclite1
libpcsclite1
Reverse Depends:
pcscd
wpasupplicant
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 511b45df..d3de9a43 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -48,6 +48,7 @@ systemctl disable apt-daily.service
systemctl disable apt-daily.timer
systemctl disable apt-daily-upgrade.timer
systemctl disable apt-daily-upgrade.service
+systemctl disable pcscd.service
systemctl enable vyos-hostsd.service
systemctl enable acpid.service
--
cgit v1.2.3
From f2dd696099c684efd2b9deb19db169082487320a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 2 Dec 2019 21:00:34 +0100
Subject: systemd: man: do not rebuild man db once a day
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index d3de9a43..5d591e7e 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -49,6 +49,7 @@ systemctl disable apt-daily.timer
systemctl disable apt-daily-upgrade.timer
systemctl disable apt-daily-upgrade.service
systemctl disable pcscd.service
+systemctl disable man-db.timer
systemctl enable vyos-hostsd.service
systemctl enable acpid.service
--
cgit v1.2.3
From 51d1f85b515357f20fa75d08d175641e383c92f8 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 2 Dec 2019 21:00:50 +0100
Subject: systemd: ntp: service is handled by VyOS CLI
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 5d591e7e..c0c24728 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -50,6 +50,7 @@ systemctl disable apt-daily-upgrade.timer
systemctl disable apt-daily-upgrade.service
systemctl disable pcscd.service
systemctl disable man-db.timer
+systemctl disable ntp.service
systemctl enable vyos-hostsd.service
systemctl enable acpid.service
--
cgit v1.2.3
From 143dfc0c67bef36d7d4f30fb052605b8ec6b1460 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 2 Dec 2019 21:01:35 +0100
Subject: systemd: igmpproxy: service is handled by VyOS CLI
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index c0c24728..30ed2c7a 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -51,6 +51,7 @@ systemctl disable apt-daily-upgrade.service
systemctl disable pcscd.service
systemctl disable man-db.timer
systemctl disable ntp.service
+systemctl disable igmpproxy.service
systemctl enable vyos-hostsd.service
systemctl enable acpid.service
--
cgit v1.2.3
From 736de7a6bbfb4808eaaab27b7c18817183383e5f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 2 Dec 2019 21:02:22 +0100
Subject: systemd: cryptsetup: we do not support encrypted volumes
---
data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 +
1 file changed, 1 insertion(+)
(limited to 'data')
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 30ed2c7a..50325aeb 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -52,6 +52,7 @@ systemctl disable pcscd.service
systemctl disable man-db.timer
systemctl disable ntp.service
systemctl disable igmpproxy.service
+systemctl disable cryptsetup.service
systemctl enable vyos-hostsd.service
systemctl enable acpid.service
--
cgit v1.2.3