From fa6fe744ef4155d02fe795b17dc8516c67744384 Mon Sep 17 00:00:00 2001 From: Benjamin Pill Date: Thu, 18 Jul 2019 18:32:46 +0200 Subject: Add note about building the image on non-linux systems using docker Currently it is only working on linux systems (using docker) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8e1636ce..bc0b616a 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,8 @@ $ apt-get update -o Acquire::Check-Valid-Until=false ### Docker +**NOTE:** Currently the image can only be build with docker on Linux system + Using our [Dockerfile](docker/Dockerfile) you create your own Docker container that is used to build a VyOS ISO image or other required VyOS packages. The [Dockerfile](docker/Dockerfile) contains some of the most used packages needed -- cgit v1.2.3 From b75025546cf8a0a889902ed6dbd8c2b86209b3c9 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Thu, 25 Jul 2019 00:28:17 +0700 Subject: Change default debug user password to "debuguser" --- tools/cloud-init/99-debug-user.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cloud-init/99-debug-user.chroot b/tools/cloud-init/99-debug-user.chroot index 7b72f898..354b46ab 100755 --- a/tools/cloud-init/99-debug-user.chroot +++ b/tools/cloud-init/99-debug-user.chroot @@ -6,7 +6,7 @@ if [ $(id -u) -eq 0 ]; then echo "$username exists!" exit 1 else - pass=$(perl -e 'print crypt($ARGV[0], "password")' dKD3UKamS3MQ) + pass=$(perl -e 'print crypt($ARGV[0], "password")' debuguser) useradd -m -p $pass debuguser usermod -aG sudo debuguser [ $? -eq 0 ] && echo "User has been added to system!" || echo "Failed to add a user!" -- cgit v1.2.3 From e81b7d5b25cd57fa8c8c9cc085703b68932eee3d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 31 Jul 2019 21:41:55 +0200 Subject: [intel] T1554: enable RSS and Multiqueue for Intel IGB/IXGBE drivers --- data/live-build-config/includes.chroot/etc/modprobe.d/igb-options.conf | 1 + .../live-build-config/includes.chroot/etc/modprobe.d/ixgbe-options.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 data/live-build-config/includes.chroot/etc/modprobe.d/igb-options.conf 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 -- cgit v1.2.3 From 90759a092e85517f80c8937b4a40f0493123c501 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 5 Aug 2019 14:21:22 +0200 Subject: T1562: change version scheme on current branch used for rolling releases --- data/versions | 2 +- scripts/make-version-file | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/versions b/data/versions index 3d0c2871..4fbf63f2 100644 --- a/data/versions +++ b/data/versions @@ -1,3 +1,3 @@ { - "current": "1.2.0" + "current": "1.2" } diff --git a/scripts/make-version-file b/scripts/make-version-file index 4df2cb6c..fa632eed 100755 --- a/scripts/make-version-file +++ b/scripts/make-version-file @@ -64,7 +64,7 @@ if build_config['build_type'] == 'development': git_branch = repo.active_branch.name branch_version = version_mapping[git_branch] - version = "{0}-rolling+{1}".format(branch_version, build_timestamp) + version = "{0}-rolling-{1}".format(branch_version, build_timestamp) except Exception as e: print("Could not build a version string specific to git branch, falling back to default: {0}".format(str(e))) version = "999.{0}".format(build_timestamp) -- cgit v1.2.3 From ff7f28f359405fe3332b056d1d0f991e845c338a Mon Sep 17 00:00:00 2001 From: Donny Maasland Date: Sat, 10 Aug 2019 13:09:41 +0200 Subject: Fix default key path --- scripts/build-vmware-image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image index dc680378..665d0f58 100755 --- a/scripts/build-vmware-image +++ b/scripts/build-vmware-image @@ -196,7 +196,7 @@ openssl sha1 *.vmdk *.ovf > vyos_vmware_image.mf # Convert the OVF to signed OVA... echo 'Converting the OVF to signed OVA...' -private_key=${PRIVATE_KEY_PATH:-"../../key/privatekey.pem"} +private_key=${PRIVATE_KEY_PATH:-"../key/privatekey.pem"} if [ ! -f ${private_key} ]; then echo 'Please put your key to "key/privatekey.pem" in repository root, or set PRIVATE_KEY_PATH to environment variables.' exit 1 -- cgit v1.2.3 From d1e82e5de7e60800859a3801730b42fd67d65252 Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Fri, 16 Aug 2019 14:13:25 +0200 Subject: do not disable metadata for openstack images --- tools/cloud-init/openstack/90_dpkg.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/cloud-init/openstack/90_dpkg.cfg b/tools/cloud-init/openstack/90_dpkg.cfg index a740b314..479924cf 100644 --- a/tools/cloud-init/openstack/90_dpkg.cfg +++ b/tools/cloud-init/openstack/90_dpkg.cfg @@ -1,6 +1,5 @@ # to update this file, run dpkg-reconfigure cloud-init datasource_list: [ NoCloud, ConfigDrive, OpenNebula, DigitalOcean, AltCloud, MAAS, OpenStack, CloudSigma, SmartOS, None ] -disable_ec2_metadata: true datasource: OpenStack: max_wait: 6 -- cgit v1.2.3 From e7366172e54744b96268823489bc2b2e80d5fe63 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 02:24:50 +0200 Subject: Packages: remove obsolete vyatta-openvpn --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index 69cef3c0..c4120d13 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -157,7 +157,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-cfg-qos', 'vyatta-op-qos', 'vyatta-cfg-op-pppoe', - 'vyatta-openvpn', 'vyatta-conntrack', 'vyatta-conntrack-sync', 'vyatta-nat', -- cgit v1.2.3 From 204e0cb825de1d221b7b33a5766bd47be6d4ec06 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 02:39:14 +0200 Subject: T1592: update Linux Kernel to v4.19.67 --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index bf6e4bca..b467276c 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "jessie", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.54", + "kernel_version": "4.19.67", "kernel_flavor": "amd64-vyos", "additional_repositories": [ "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main", -- cgit v1.2.3