[ general ] move Wireguard under configuration.sh and remove from ins…

…erting for 3.10.y since it breaks there.
armbian · Jan 29, 2019 · 3365d7c · 3365d7c
1 parent 2e8f56a
commit 3365d7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/compilation.sh b/lib/compilation.sh
@@ -262,7 +262,7 @@ compile_kernel()
 	local version=$(grab_version "$kerneldir")
 
 	# add WireGuard
-	if linux-version compare $version ge 3.10 ; then
+	if linux-version compare $version ge 3.14 ; then
 		if [[ ! -d $SRC/cache/sources/$LINUXSOURCEDIR/net/wireguard && $WIREGUARD == yes ]]; then
 		display_alert "Adding" "WireGuard" "info"
 		$SRC/cache/sources/wireguard/contrib/kernel-tree/jury-rig.sh $SRC/cache/sources/$LINUXSOURCEDIR

diff --git a/lib/configuration.sh b/lib/configuration.sh
@@ -65,6 +65,7 @@ SERIALCON=ttyS0
 CAN_BUILD_STRETCH=yes
 [[ -z $CRYPTROOT_SSH_UNLOCK ]] && CRYPTROOT_SSH_UNLOCK=yes
 [[ -z $CRYPTROOT_SSH_UNLOCK_PORT ]] && CRYPTROOT_SSH_UNLOCK_PORT=2022
+[[ -z $WIREGUARD ]] && WIREGUARD="yes"
 
 # single ext4 partition is the default and preferred configuration
 #BOOTFS_TYPE=''