Commit 207733ab authored by Natanael Copa's avatar Natanael Copa
Browse files

setup-alpine: add USERSSHKEY option to answerfile

Add a variable for user's ssh key, USERSSHKEY. We need this because the
key is space separated and we want avoid parse USEROPTS with eval to
handle quotes.

fixes https://gitlab.alpinelinux.org/alpine/alpine-conf/-/issues/10520
parent e13c6000
Pipeline #126803 passed with stage
in 23 seconds
......@@ -113,7 +113,8 @@ if [ -n "$CREATEANSWERFILE" ]; then
APKREPOSOPTS="-1"
# Create admin user
USEROPTS="-a -u -g audio,video,netdev -k https://example.com/juser.keys juser"
USEROPTS="-a -u -g audio,video,netdev juser"
USERSSHKEY="https://example.com/juser.keys"
# Install Openssh
SSHDOPTS=openssh
......@@ -231,7 +232,7 @@ if [ "$quick" = 1 ]; then
exit 0
fi
setup-user ${USEROPTS:--a -g 'audio video netdev'}
setup-user ${USERSSHKEY+-k "$USERSSHKEY"} ${USEROPTS:--a -g 'audio video netdev'}
setup-sshd ${SSHDOPTS}
if is_xen_dom0; then
......
......@@ -28,6 +28,9 @@ setup_alpine_create_answerfile_body() {
mkdir -p usr/share/zoneinfo/
touch usr/share/zoneinfo/UTC
sed -i -e 's/^USERSSHKEY=.*/USERSSHKEY="ssh-rsa blahbla user@example.com"/' \
answers
atf_check -s exit:0 \
-o match:"Starting hostname" \
-o match:"Starting mdev" \
......@@ -35,5 +38,7 @@ setup_alpine_create_answerfile_body() {
-o match:"adduser" \
-o match:"apk add" \
setup-alpine -f answers
grep "ssh-rsa blahbla user@example.com" home/juser/.ssh/authorized_keys \
|| atf_fail "ssh key not set for juser"
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment