Skip to content

Commit 0d0956b

Browse files
committed
Alpine 3.19 has working PAM support by default
Signed-off-by: Jan Dubois <[email protected]>
1 parent 3293b41 commit 0d0956b

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ${DOCKER} run --rm \
2222
-v "${PWD}/qemu-${QEMU_VERSION}-copying:/home/build/qemu-copying:ro" \
2323
-v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}:/home/build/cri-dockerd.tar.gz:ro" \
2424
-v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}.LICENSE:/home/build/cri-dockerd.license:ro" \
25-
-v "${PWD}/sshd.pam:/home/build/sshd.pam:ro" \
2625
$(env | grep ^LIMA_ | xargs -n 1 printf -- '-e %s ') \
2726
-e "LIMA_REPO_VERSION=${REPO_VERSION}" \
2827
-e "LIMA_BUILD_ID=${BUILD_ID}" \

genapkovl-lima.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ EOF
4444
mkdir -p "$tmp"/etc/apk
4545
makefile root:root 0644 "$tmp"/etc/apk/world <<EOF
4646
alpine-base
47-
openssh-server-pam
47+
openssh-server
4848
EOF
4949

5050
rc_add devfs sysinit
@@ -99,9 +99,6 @@ EOF
9999

100100
rc_add lima-overlay default
101101

102-
mkdir -p "$tmp"/etc/pam.d
103-
cp /home/build/sshd.pam "${tmp}/etc/pam.d/sshd"
104-
105102
if [ "${LIMA_INSTALL_LIMA_INIT}" == "true" ]; then
106103
rc_add lima-init default
107104
rc_add lima-init-local default

mkimg.lima.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ profile_lima() {
1313
kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
1414
syslinux_serial="0 115200"
1515
apkovl="genapkovl-lima.sh"
16-
apks="$apks openssh-server-pam"
16+
apks="$apks openssh-server"
1717
if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
1818
apks="$apks ca-certificates"
1919
fi

sshd.pam

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)