board: pluto & m2k: Enable persistent ssh keys and passwd changes

This patch adds support for saving the SSH keys and password files on the JFFS2 partition on mtd2. There are three new helper scripts for this. Signed-off-by: Michael Hennerich <[email protected]>
analogdevicesinc · Jun 21, 2020 · 2ee30e3 · 2ee30e3
1 parent 1bfa9dc
commit 2ee30e3
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 0 deletions.
diff --git a/board/m2k/S21misc b/board/m2k/S21misc
@@ -15,6 +15,9 @@ handle_calibration_files() {
 
 case "$1" in
  start)
+	# Restore saved password and Dropbear keys
+	[[ -d /mnt/jffs2/etc ]] && cd /mnt/jffs2/etc && md5sum -s -c password.md5 && cp passwd shadow group /etc
+	[[ -d /mnt/jffs2/etc/dropbear ]] && cd /mnt/jffs2/etc/dropbear && md5sum -s -c keys.md5 && cp dropbear* /etc/dropbear/
 	iio_attr -q -d m2k-fabric clk_powerdown 1
 	handle_calibration_files
 	;;

diff --git a/board/m2k/post-build.sh b/board/m2k/post-build.sh
@@ -34,11 +34,13 @@ genimage                           \
 
 rm -f ${TARGET_DIR}/opt/boot.vfat
 rm -f ${TARGET_DIR}/etc/init.d/S99iiod
+rm -Rf ${TARGET_DIR}/etc/dropbear
 
 mkdir -p ${TARGET_DIR}/www/img
 mkdir -p ${TARGET_DIR}/mnt/jffs2
 mkdir -p ${TARGET_DIR}/mnt/msd
 mkdir -p ${TARGET_DIR}/etc/wpa_supplicant/
+mkdir -p ${TARGET_DIR}/etc/dropbear
 
 ${INSTALL} -D -m 0755 ${BOARD_DIR}/../pluto/update.sh ${TARGET_DIR}/sbin/
 ${INSTALL} -D -m 0755 ${BOARD_DIR}/../pluto/update_frm.sh ${TARGET_DIR}/sbin/
@@ -55,6 +57,8 @@ ${INSTALL} -D -m 0644 ${BOARD_DIR}/../pluto/fw_env.config ${TARGET_DIR}/etc/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/VERSIONS ${TARGET_DIR}/opt/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/m2k-calib.ini ${TARGET_DIR}/opt/
 ${INSTALL} -D -m 0755 ${BOARD_DIR}/../pluto/device_reboot ${TARGET_DIR}/usr/sbin/
+${INSTALL} -D -m 0755 {BOARD_DIR}/../pluto/device_passwd ${TARGET_DIR}/usr/sbin/
+${INSTALL} -D -m 0755 {BOARD_DIR}/../pluto/device_persistent_keys ${TARGET_DIR}/usr/sbin/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/motd ${TARGET_DIR}/etc/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/device_config ${TARGET_DIR}/etc/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/../pluto/mdev.conf ${TARGET_DIR}/etc/

diff --git a/board/pluto/S21misc b/board/pluto/S21misc
@@ -17,6 +17,9 @@ xo_correction() {
 case "$1" in
 	start|"")
 		echo -n "Starting miscellaneous setup: "
+		# Restore saved password and Dropbear keys
+		[[ -d /mnt/jffs2/etc ]] && cd /mnt/jffs2/etc && md5sum -s -c password.md5 && cp passwd shadow group /etc
+		[[ -d /mnt/jffs2/etc/dropbear ]] && cd /mnt/jffs2/etc/dropbear && md5sum -s -c keys.md5 && cp dropbear* /etc/dropbear/
 		xo_correction
 		MAX_BS=`fw_printenv -n iio_max_block_size 2> /dev/null || echo 67108864`
 		echo ${MAX_BS} > /sys/module/industrialio_buffer_dma/parameters/max_block_size

diff --git a/board/pluto/device_format_jffs2 b/board/pluto/device_format_jffs2
@@ -0,0 +1,12 @@
+#!/bin/sh
+set +e
+
+while true;
+do
+	read -p "Are you sure to delete/format your mtd2 JFFS2 partition? (yes/no) " answ
+	case $answ in
+		[Yy]* ) flash_erase -j /dev/mtd2 0 0; break;;
+		[Nn]* ) exit;;
+		* ) echo "Please answer yes or no.";;
+	esac
+done
diff --git a/board/pluto/device_passwd b/board/pluto/device_passwd
@@ -0,0 +1,10 @@
+#!/bin/sh
+set +e
+
+cat /proc/mounts | grep -q mtd2 || (echo "Filesystem not mounted use device_format_jffs2 command to setup your partition"; exit 1)
+
+passwd
+install -D /etc/passwd /etc/shadow /etc/group -t /mnt/jffs2/etc
+cd /etc
+md5sum passwd shadow group 2>/dev/null > /mnt/jffs2/etc/password.md5
+
diff --git a/board/pluto/device_persistent_keys b/board/pluto/device_persistent_keys
@@ -0,0 +1,15 @@
+#!/bin/sh
+set +e
+
+KEYFILE=/etc/dropbear/dropbear_ecdsa_host_key
+
+cat /proc/mounts | grep -q mtd2 || (echo "Filesystem not mounted use device_format_jffs2 command to setup your partition"; exit 1)
+
+#dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+[[ ! -f ${KEYFILE} ]] && dropbearkey -t ecdsa -f ${KEYFILE}
+install -D ${KEYFILE} -t /mnt/jffs2/etc/dropbear
+cd /etc/dropbear
+md5sum dropbear* /etc/dropbear/ 2>/dev/null > /mnt/jffs2/etc/dropbear/keys.md5
+
+
+
diff --git a/board/pluto/post-build.sh b/board/pluto/post-build.sh
@@ -45,11 +45,13 @@ genimage                           \
 
 rm -f ${TARGET_DIR}/opt/boot.vfat
 rm -f ${TARGET_DIR}/etc/init.d/S99iiod
+rm -Rf ${TARGET_DIR}/etc/dropbear
 
 mkdir -p ${TARGET_DIR}/www/img
 mkdir -p ${TARGET_DIR}/etc/wpa_supplicant/
 mkdir -p ${TARGET_DIR}/mnt/jffs2
 mkdir -p ${TARGET_DIR}/mnt/msd
+mkdir -p ${TARGET_DIR}/etc/dropbear
 
 ${INSTALL} -D -m 0755 ${BOARD_DIR}/update.sh ${TARGET_DIR}/sbin/
 ${INSTALL} -D -m 0755 ${BOARD_DIR}/update_frm.sh ${TARGET_DIR}/sbin/
@@ -65,6 +67,9 @@ ${INSTALL} -D -m 0755 ${BOARD_DIR}/S45msd ${TARGET_DIR}/etc/init.d/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/fw_env.config ${TARGET_DIR}/etc/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/VERSIONS ${TARGET_DIR}/opt/
 ${INSTALL} -D -m 0755 ${BOARD_DIR}/device_reboot ${TARGET_DIR}/usr/sbin/
+${INSTALL} -D -m 0755 ${BOARD_DIR}/device_passwd ${TARGET_DIR}/usr/sbin/
+${INSTALL} -D -m 0755 ${BOARD_DIR}/device_persistent_keys ${TARGET_DIR}/usr/sbin/
+${INSTALL} -D -m 0755 ${BOARD_DIR}/device_format_jffs2 ${TARGET_DIR}/usr/sbin/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/motd ${TARGET_DIR}/etc/
 ${INSTALL} -D -m 0755 ${BOARD_DIR}/test_ensm_pinctrl.sh ${TARGET_DIR}/usr/sbin/
 ${INSTALL} -D -m 0644 ${BOARD_DIR}/device_config ${TARGET_DIR}/etc/