Merge pull request #636 from go-debos/wip/daissi/pacstrap-extra-packages

pacstrap_action: add an option to install extra packages

Author: obbardc

.github/workflows/ci.yaml

@@ -222,6 +222,8 @@ jobs:
             test: { name: "raw (4096 sector size)", case: "raw", variables: "-t sectorsize:4096" }
           - backend: kvm
             test: { name: "arch", case: "arch" }
+          - backend: kvm
+            test: { name: "arch (pacstrap with extra packages)", case: "arch-pacstrap-extra-packages" }
           - backend: kvm
             test: { name: "apertis", case: "apertis" }
           - backend: kvm

actions/pacstrap_action.go

@@ -7,11 +7,20 @@ Construct the target rootfs with pacstrap tool.
 	- action: pacstrap
 	  config: <in-tree pacman.conf file>
 	  mirror: <in-tree mirrorlist file>
+	  packages: <list of packages to install>
 
 Mandatory properties:
 
   - config -- the pacman.conf file which will be used through the process
   - mirror -- the mirrorlist file which will be used through the process
+
+Optional properties:
+
+  - packages -- list of packages to install
+    If no packages are specified to be installed, pacstrap will install
+    the base metapackage by default. The base metapackage is only automatically
+    installed when this list is empty, this means that it must be added to the
+    list when adding packages.
 */
 package actions
 
@@ -27,8 +36,9 @@ import (
 
 type PacstrapAction struct {
 	debos.BaseAction `yaml:",inline"`
-	Config           string `yaml:"config"`
-	Mirror           string `yaml:"mirror"`
+	Config           string   `yaml:"config"`
+	Mirror           string   `yaml:"mirror"`
+	Packages         []string `yaml:"packages"`
 }
 
 func (d *PacstrapAction) listOptionFiles(context *debos.Context) ([]string, error) {
@@ -121,6 +131,11 @@ func (d *PacstrapAction) Run(context *debos.Context) error {
 
 	// Run pacstrap
 	cmdline = []string{"pacstrap", context.Rootdir}
+
+	if d.Packages != nil {
+		cmdline = append(cmdline, d.Packages...)
+	}
+
 	if err := (debos.Command{}.Run("pacstrap", cmdline...)); err != nil {
 		log := path.Join(context.Rootdir, "var/log/pacman.log")
 		_ = debos.Command{}.Run("pacstrap.log", "cat", log)

tests/arch-pacstrap-extra-packages/mirrorlist

@@ -0,0 +1,3 @@
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://mirror.leaseweb.net/archlinux/$repo/os/$arch

tests/arch-pacstrap-extra-packages/pacman.conf

@@ -0,0 +1,95 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#NoProgressBar
+CheckSpace
+#VerbosePkgLists
+#ParallelDownloads = 5
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Required DatabaseTrustedOnly
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs

tests/arch-pacstrap-extra-packages/test.yaml

@@ -0,0 +1,11 @@
+---
+{{- $architecture := or .architecture "amd64"}}
+architecture: {{$architecture}}
+
+actions:
+  - action: pacstrap
+    config: pacman.conf
+    mirror: mirrorlist
+    packages:
+      - base
+      - procps