diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-08-19 12:43:42 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-08-19 12:43:42 -0400 |
| commit | 12189cca7be5a967a7eccd808fe144d26f404bcb (patch) | |
| tree | 59f05d2ac3c97ea4ce6274fb883e061f9b8ab20f /data | |
| parent | b8be8d281587cbed6f5fbf5133c4d7cc1951ea6b (diff) | |
| parent | 204e0cb825de1d221b7b33a5766bd47be6d4ec06 (diff) | |
| download | vyos-build-12189cca7be5a967a7eccd808fe144d26f404bcb.tar.gz vyos-build-12189cca7be5a967a7eccd808fe144d26f404bcb.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'data')
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | data/live-build-config/includes.chroot/etc/modprobe.d/igb-options.conf | 1 | ||||
| -rw-r--r-- | data/live-build-config/includes.chroot/etc/modprobe.d/ixgbe-options.conf | 2 | ||||
| -rw-r--r-- | data/versions | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/data/defaults.json b/data/defaults.json index 964e5da9..a8b8e8d3 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.54", + "kernel_version": "4.19.67", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] diff --git a/data/live-build-config/includes.chroot/etc/modprobe.d/igb-options.conf b/data/live-build-config/includes.chroot/etc/modprobe.d/igb-options.conf new file mode 100644 index 00000000..796dbf63 --- /dev/null +++ b/data/live-build-config/includes.chroot/etc/modprobe.d/igb-options.conf @@ -0,0 +1 @@ +options igb RSS=0,0 diff --git a/data/live-build-config/includes.chroot/etc/modprobe.d/ixgbe-options.conf b/data/live-build-config/includes.chroot/etc/modprobe.d/ixgbe-options.conf index 79b97aea..aa3aeb5a 100644 --- a/data/live-build-config/includes.chroot/etc/modprobe.d/ixgbe-options.conf +++ b/data/live-build-config/includes.chroot/etc/modprobe.d/ixgbe-options.conf @@ -1 +1 @@ -options ixgbe allow_unsupported_sfp=1 +options ixgbe allow_unsupported_sfp=1 RSS=0,0 diff --git a/data/versions b/data/versions index 5cbb0ad3..b5d0fcb6 100644 --- a/data/versions +++ b/data/versions @@ -1,4 +1,4 @@ { - "equuleus": "1.3.0", - "current": "1.2.0" + "equuleus": "1.3", + "current": "1.2" } |