From: Glen Huang <redacted>
Date: Thu, 13 Apr 2023 09:55:02 +0000 (+0800)
Subject: openssh: preserve authorized_keys
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e36a55c9ed293bd608d18918cdda8dceffad9d96;p=openwrt-packages.git

openssh: preserve authorized_keys

The root user is usually the user that clients ssh into with, so in most
cases its authorized_keys determines what clients are allowed to ssh
into this device. Without preserving this file, they could potentially
be locked out after upgrading.

Signed-off-by: Glen Huang <redacted>
---

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 66c32f7ba..06cba0afe 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
 PKG_VERSION:=9.3p1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -105,6 +105,7 @@ define Package/openssh-server/conffiles
 /etc/ssh/ssh_host_ed25519_key.pub
 /etc/ssh/ssh_host_rsa_key
 /etc/ssh/ssh_host_rsa_key.pub
+/root/.ssh/authorized_keys
 endef
 
 define Package/openssh-server-pam