File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -192,12 +192,13 @@ if [[ ${org_mtime} -ne ${new_mtime} && "${org_chksum}" != "${new_chksum}" ]]; th
192
192
cat ${server_pem} ${server_crt_ca_pem} > ${combined_pem}
193
193
chmod 400 ${server_pem} ${combined_pem}
194
194
# IMPORTANT: daemons will fail unless combined_pem is UID/GID-owned
195
+ # NOTE: strip trailing carriage return from podman exec output at least
195
196
if [ -z " ${container_manager} " ]; then
196
197
MIGUID=$( id -u ${mig_user} )
197
198
MIGGID=$( id -g ${mig_group} )
198
199
else
199
- MIGUID=$( ${container_manager} exec -it migrid id -u ${mig_user} )
200
- MIGGID=$( ${container_manager} exec -it migrid id -g ${mig_group} )
200
+ MIGUID=$( ${container_manager} exec -it migrid id -u ${mig_user} | tr -d ' \r ' )
201
+ MIGGID=$( ${container_manager} exec -it migrid id -g ${mig_group} | tr -d ' \r ' )
201
202
fi
202
203
chown " ${MIGUID} :${MIGGID} " ${combined_pem}
203
204
if [[ ${verbose} -eq 1 ]]; then
You can’t perform that action at this time.
0 commit comments