summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/defaults.json8
-rwxr-xr-xdata/live-build-config/hooks/live/10-unmountfs.chroot2
-rwxr-xr-xdata/live-build-config/hooks/live/24-efi_packages.chroot2
-rw-r--r--data/live-build-config/package-lists/vyos-utils.list.chroot3
-rw-r--r--data/package-lists/vyos-x86.list.chroot2
-rw-r--r--data/versions1
6 files changed, 7 insertions, 11 deletions
diff --git a/data/defaults.json b/data/defaults.json
index bf6e4bca..5e6515d9 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.54",
"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/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 \
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
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 4dcfef1e..ee2073fb 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
diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot
index 6f5d7624..8e2b8692 100644
--- a/data/package-lists/vyos-x86.list.chroot
+++ b/data/package-lists/vyos-x86.list.chroot
@@ -2,5 +2,5 @@ grub2
grub-pc
qemu-guest-agent
hyperv-daemons
-vyos-xe-guest-utilities
vyos-netplug
+vyos-xe-guest-utilities
diff --git a/data/versions b/data/versions
index 3d0c2871..5cbb0ad3 100644
--- a/data/versions
+++ b/data/versions
@@ -1,3 +1,4 @@
{
+ "equuleus": "1.3.0",
"current": "1.2.0"
}