From a948e9855bde6266ba81c8a9cea8e06c9a648bca Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Tue, 1 Aug 2017 16:01:12 +0300
Subject: [PATCH] Move and simplify some distribution specific tweaks

---
 lib/distributions.sh                          | 35 +++----------------
 lib/makeboarddeb.sh                           | 22 ++++++++++++
 packages/bsp/10-no-new-privileges.conf        |  2 ++
 packages/bsp/99disable-power-management       |  5 +++
 .../bsp/zz-override-wifi-powersave-off.conf   |  2 ++
 5 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 packages/bsp/10-no-new-privileges.conf
 create mode 100644 packages/bsp/99disable-power-management
 create mode 100644 packages/bsp/zz-override-wifi-powersave-off.conf

diff --git a/lib/distributions.sh b/lib/distributions.sh
index 9fa58e71f2..a4c756b914 100644
--- a/lib/distributions.sh
+++ b/lib/distributions.sh
@@ -169,6 +169,9 @@ install_common()
 
 	# save initial armbian-release state
 	cp $SDCARD/etc/armbian-release $SDCARD/etc/armbian-image-release
+
+	# premit root login via SSH for the first boot
+	sed -i 's/PermitRootLogin .*/PermitRootLogin yes/' $SDCARD/etc/ssh/sshd_config
 }
 
 install_distribution_specific()
@@ -176,49 +179,19 @@ install_distribution_specific()
 	display_alert "Applying distribution specific tweaks for" "$RELEASE" "info"
 	case $RELEASE in
 	jessie)
-		# enable root login for latest ssh on jessie
-		sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' $SDCARD/etc/ssh/sshd_config
-
-		mkdir -p $SDCARD/etc/NetworkManager/dispatcher.d/
-		cat <<-'EOF' > $SDCARD/etc/NetworkManager/dispatcher.d/99disable-power-management
-		#!/bin/sh
-		case "$2" in
-			up) /sbin/iwconfig $1 power off || true ;;
-			down) /sbin/iwconfig $1 power on || true ;;
-		esac
-		EOF
-		chmod 755 $SDCARD/etc/NetworkManager/dispatcher.d/99disable-power-management
 		;;
 
 	xenial)
-		# enable root login for latest ssh on jessie
-		sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' $SDCARD/etc/ssh/sshd_config
-
 		# remove legal info from Ubuntu
 		[[ -f $SDCARD/etc/legal ]] && rm $SDCARD/etc/legal
 
-		# Fix for haveged service
-		# required only on pre-4.x kernels
-		mkdir -p -m755 $SDCARD/etc/systemd/system/haveged.service.d
-		cat <<-EOF > $SDCARD/etc/systemd/system/haveged.service.d/10-no-new-privileges.conf
-		[Service]
-		NoNewPrivileges=false
-		EOF
-
 		# disable not working on unneeded services
 		# ureadahead needs kernel tracing options that AFAIK are present only in mainline
 		chroot $SDCARD /bin/bash -c "systemctl --no-reload mask ondemand.service ureadahead.service setserial.service etc-setserial.service >/dev/null 2>&1"
-
-		# properly disable powersaving wireless mode for NetworkManager
-		mkdir -p $SDCARD/etc/NetworkManager/conf.d/
-		cat <<-EOF > $SDCARD/etc/NetworkManager/conf.d/zz-override-wifi-powersave-off.conf
-		[connection]
-		wifi.powersave = 2
-		EOF
 		;;
 
 	stretch)
-	;;
+		;;
 	esac
 }
 
diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh
index fb01b693a0..82d2533622 100644
--- a/lib/makeboarddeb.sh
+++ b/lib/makeboarddeb.sh
@@ -183,6 +183,28 @@ create_board_package()
 		cp $SRC/packages/bsp/mpv/mpv_mainline.conf $destination/etc/mpv/mpv.conf
 	fi
 
+	case $RELEASE in
+	jessie)
+		mkdir -p $destination/etc/NetworkManager/dispatcher.d/
+		install -m 755 $SRC/packages/bsp/99disable-power-management $destination/etc/NetworkManager/dispatcher.d/
+	;;
+	xenial)
+		mkdir -p $destination/etc/NetworkManager/conf.d/
+		cp $SRC/packages/bsp/zz-override-wifi-powersave-off.conf $destination/etc/NetworkManager/conf.d/
+		if [[ $BRANCH == default ]]; then
+			# this is required only for old kernels
+			# not needed for Stretch since there will be no Stretch images with kernels < 4.4
+			mkdir -p $destination/lib/systemd/system/haveged.service.d/
+			cp $SRC/packages/bsp/10-no-new-privileges.conf $destination/lib/systemd/system/haveged.service.d/
+		fi
+	;;
+
+	stretch)
+		mkdir -p $destination/etc/NetworkManager/conf.d/
+		cp $SRC/packages/bsp/zz-override-wifi-powersave-off.conf $destination/etc/NetworkManager/conf.d/
+	;;
+	esac
+
 	# execute $LINUXFAMILY-specific tweaks
 	[[ $(type -t family_tweaks_bsp) == function ]] && family_tweaks_bsp
 
diff --git a/packages/bsp/10-no-new-privileges.conf b/packages/bsp/10-no-new-privileges.conf
new file mode 100644
index 0000000000..7b64f6921f
--- /dev/null
+++ b/packages/bsp/10-no-new-privileges.conf
@@ -0,0 +1,2 @@
+[Service]
+NoNewPrivileges=false
diff --git a/packages/bsp/99disable-power-management b/packages/bsp/99disable-power-management
new file mode 100644
index 0000000000..341a269d8a
--- /dev/null
+++ b/packages/bsp/99disable-power-management
@@ -0,0 +1,5 @@
+#!/bin/sh
+case "$2" in
+	up) /sbin/iwconfig $1 power off || true ;;
+	down) /sbin/iwconfig $1 power on || true ;;
+esac
diff --git a/packages/bsp/zz-override-wifi-powersave-off.conf b/packages/bsp/zz-override-wifi-powersave-off.conf
new file mode 100644
index 0000000000..111af0beb8
--- /dev/null
+++ b/packages/bsp/zz-override-wifi-powersave-off.conf
@@ -0,0 +1,2 @@
+[connection]
+wifi.powersave = 2