Merge branch 'current' into equuleus

8 files changed, 10 insertions, 7 deletions

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
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"
 }
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
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)
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!"