neil/lxc-templates
1
0
Fork 1
mirror of https://github.com/lxc/lxc-templates.git synced 2025-06-24 10:04:45 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: neil:fbb2a909dbcd291a268b1943e2257eb44e89c231
Branches Tags
neil:main
neil:lxc-templates-3.0.4
neil:lxc-templates-3.0.3
neil:lxc-templates-3.0.2
neil:lxc-templates-3.0.1
neil:lxc-templates-3.0.0
neil:lxc-templates-3.0.0.beta1
..
compare: neil:96c78bebf51560f7313440ec6ab1bd56ce51d190
Branches Tags
neil:main
neil:lxc-templates-3.0.4
neil:lxc-templates-3.0.3
neil:lxc-templates-3.0.2
neil:lxc-templates-3.0.1
neil:lxc-templates-3.0.0
neil:lxc-templates-3.0.0.beta1

2 Commits
fbb2a909db ... 96c78bebf5

Author SHA1 Message Date
Stéphane Graber
96c78bebf5
Merge pull request #56 from kevinoid/debian-getopt-mirror 
lxc-debian: fix getopt parsing of --mirror
 2023-04-14 01:22:19 -04:00
Kevin Locke
a37d6d40f6 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: eebcd76feb47 ("lxc-debian: allow using a custom keyring")
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
 2023-03-22 15:45:26 -06:00
1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
templates/lxc-debian.in
View File

@ -715,7 +715,7 @@ EOF
return 0 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 if [ $? -ne 0 ]; then
usage "$(basename "$0")" usage "$(basename "$0")"
exit 1 exit 1