[lxc-devel] [PATCH] lxc-archlinux.in: Add pacman keyring initialization back

[Stéphane Graber]

On Wed, Jun 25, 2014 at 12:52:20PM +0800, Alexander Vladimirov wrote:
> Shuffle around usage text a bit and add missing -d while there.
> 
> Signed-off-by: Alexander Vladimirov <alexander.idkfa.vladimirov at gmail.com>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  templates/lxc-archlinux.in | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
> index 6f3ce2e..a95564b 100644
> --- a/templates/lxc-archlinux.in
> +++ b/templates/lxc-archlinux.in
> @@ -102,6 +102,9 @@ sed -e 's/^ConditionPathExists=/# ConditionPathExists=/' \
>      -e 's/After=dev-%i.device/After=/' \
>      < /lib/systemd/system/getty\@.service \
>      > /etc/systemd/system/getty\@.service
> +# initialize pacman keyring
> +pacman-key --init
> +pacman-key --populate archlinux
>  EOF
>      # enable getty on active ttys
>      nttys=$(grep lxc.tty ${config_path}/config | cut -d= -f 2 | tr -d "[:blank:]")
> @@ -169,8 +172,10 @@ install_arch() {
>  usage() {
>      cat <<EOF
>  usage:
> -    ${1} -n|--name=<container_name> [-p|--path=<path>] [-a|--arch=<arch of the container>] [-r|--root_password=<root password>]
> -        [-P|--packages=<pkg1,pkg2,...>] [-e|--enable_units=unit1,unit2...] [-c|--config=<pacman config path>] [-h|--help]
> +    ${1} -n|--name=<container_name> [-p|--path=<path>] [-a|--arch=<arch of the container>]
> +        [-r|--root_password=<root password>] [-P|--packages=<pkg1,pkg2,...>]
> +        [-e|--enable_units=unit1,unit2...] [-d|--disable_units=unit1,unit2...]
> +        [-c|--config=<pacman config path>] [-h|--help]
>  
>  Mandatory args:
>    -n,--name           container name, used to as an identifier for that container from now on
> -- 
> 2.0.0
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140626/08447aa5/attachment.sig>