From: Leonid Isaev <lisaev@umail.iu.edu>
Date: Tue, 1 Apr 2014 02:20:48 +0000 (-0400)
Subject: archlinux: Fix default package selection
X-Git-Tag: lxc-1.1.0.alpha1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7b7d3884ef10bc2ba0f1aba35ee4f27858585bf;p=thirdparty%2Flxc.git

archlinux: Fix default package selection

Do not cherry-pick packages for the default install to avoid dependency
issues. Instead, install the base group modulo blacklisted packages.

Signed-off-by: Leonid Isaev <lisaev@umail.iu.edu>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
index 15283df19..b3bc99e92 100644
--- a/templates/lxc-archlinux.in
+++ b/templates/lxc-archlinux.in
@@ -47,32 +47,12 @@ default_locale="en-US.UTF-8"
 default_timezone="UTC"
 pacman_config="/etc/pacman.conf"
 
-# sort of minimal package set
-base_packages=(
-    "systemd"
-    "systemd-sysvcompat"
-    "filesystem"
-    "coreutils"
-    "kmod"
-    "procps"
-    "psmisc"
-    "pacman"
-    "bash"
-    "cronie"
-    "iproute2"
-    "iputils"
-    "inetutils"
-    "dhcpcd"
-    "dnsutils"
-    "nano"
-    "grep"
-    "less"
-    "gawk"
-    "sed"
-    "tar"
-    "gzip"
-    "which"
-)
+# by default, install 'base' except the kernel
+pkg_blacklist="linux"
+base_packages=()
+for pkg in $(pacman -Sqg base); do
+   [ "${pkg_blacklist#*$pkg}" = "$pkg_blacklist" ] && base_packages+=($pkg)
+done
 declare -a additional_packages
 
 # split comma-separated string into an array