From: Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com>
Date: Wed, 25 Jun 2014 04:52:20 +0000 (+0800)
Subject: lxc-archlinux.in: Add pacman keyring initialization back
X-Git-Tag: lxc-1.1.0.alpha1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99cbd2996bd5cebf1869c2f7637f6c9fc2004849;p=thirdparty%2Flxc.git

lxc-archlinux.in: Add pacman keyring initialization back

Shuffle around usage text a bit and add missing -d while there.

Signed-off-by: Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
index 6f3ce2e03..a95564b16 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