Skip to content

Commit cfb4d51

Browse files
committed
Add option to install openssh-sftp-server
This is needed by `limactl copy`, which uses `scp` internally, and newer versions of `scp` only support the `sftp` protocol. See also: https://lwn.net/Articles/835962/ Signed-off-by: Jan Dubois <[email protected]>
1 parent 0ace2e8 commit cfb4d51

File tree

7 files changed

+12
-0
lines changed

7 files changed

+12
-0
lines changed

edition/ci

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
source edition/min
22
LIMA_INSTALL_CLOUD_INIT=true
3+
LIMA_INSTALL_OPENSSH_SFTP_SERVER=true

edition/k3s

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ source edition/min
22
LIMA_INSTALL_CLOUD_INIT=true
33
LIMA_INSTALL_K3S=true
44
LIMA_INSTALL_LOGROTATE=true
5+
LIMA_INSTALL_OPENSSH_SFTP_SERVER=true

edition/min

+1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ export LIMA_INSTALL_IPTABLES=false
1111
export LIMA_INSTALL_LIMA_INIT=false
1212
export LIMA_INSTALL_LOGROTATE=false
1313
export LIMA_INSTALL_NERDCTL=false
14+
export LIMA_INSTALL_OPENSSH_SFTP_SERVER=false
1415
export LIMA_INSTALL_SSHFS=false

edition/rd

+1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ LIMA_INSTALL_IPTABLES=true
1010
LIMA_INSTALL_LIMA_INIT=true
1111
LIMA_INSTALL_LOGROTATE=true
1212
LIMA_INSTALL_NERDCTL=true
13+
LIMA_INSTALL_OPENSSH_SFTP_SERVER=true
1314
LIMA_INSTALL_SSHFS=true

edition/std

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ LIMA_INSTALL_BINFMT_MISC=true
44
LIMA_INSTALL_CA_CERTIFICATES=true
55
LIMA_INSTALL_IPTABLES=true
66
LIMA_INSTALL_LOGROTATE=true
7+
LIMA_INSTALL_OPENSSH_SFTP_SERVER=true
78
LIMA_INSTALL_SSHFS=true

genapkovl-lima.sh

+4
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,10 @@ if [ "${LIMA_INSTALL_NERDCTL}" == "true" ]; then
244244
done
245245
fi
246246

247+
if [ "${LIMA_INSTALL_OPENSSH_SFTP_SERVER}" == "true" ]; then
248+
echo "openssh-sftp-server" >> "$tmp"/etc/apk/world
249+
fi
250+
247251
if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
248252
echo "sshfs" >> "$tmp"/etc/apk/world
249253
fi

mkimg.lima.sh

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ profile_lima() {
4343
if [ "${LIMA_INSTALL_LOGROTATE}" == "true" ]; then
4444
apks="$apks logrotate"
4545
fi
46+
if [ "${LIMA_INSTALL_OPENSSH_SFTP_SERVER=true}" == "true" ]; then
47+
apks="$apks openssh-sftp-server"
48+
fi
4649
if [ "${LIMA_INSTALL_SSHFS}" == "true" ]; then
4750
apks="$apks sshfs"
4851
fi

0 commit comments

Comments
 (0)