1
0
mirror of https://github.com/lxc/lxc-templates.git synced 2024-12-22 06:20:13 +00:00

lxc-debian: fix getopt parsing of --mirror

When the --keyring option was added, the `,` between `mirror:` and
`keyring:` was omitted in the long option string passed to `getopt`.
This causes `--mirror` to be parsed as `--mirror:keyring`, matching
`*) break ;;` and prematurely terminating option parsing.  To avoid
this, add the missing `,`.  Also order `keyring:` before `mirror:` to
preserve lexical ordering of long options.

Fixes: eebcd76feb ("lxc-debian: allow using a custom keyring")
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
This commit is contained in:
Kevin Locke 2023-03-22 15:45:26 -06:00
parent fbb2a909db
commit a37d6d40f6

View File

@ -715,7 +715,7 @@ EOF
return 0
}
options=$(getopt -o hp:n:a:r:cI:FS: -l arch:,auth-key:,clean,help,enable-non-free,mirror:keyring:,name:,packages:,path:,release:,rootfs:,security-mirror:,interpreter-path:,flush-cache -- "$@")
options=$(getopt -o hp:n:a:r:cI:FS: -l arch:,auth-key:,clean,help,enable-non-free,keyring:,mirror:,name:,packages:,path:,release:,rootfs:,security-mirror:,interpreter-path:,flush-cache -- "$@")
if [ $? -ne 0 ]; then
usage "$(basename "$0")"
exit 1