From ea179eaef43060dc37657662210a1dfcfd070474 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Jan 2018 15:49:21 +0100 Subject: [PATCH] [contextualprocess] Document command lists - Show that a command list is also allowed, not just a single command. Refer to shellprocess for more documentation. --- .../contextualprocess/contextualprocess.conf | 18 ++++++++++-------- src/modules/shellprocess/shellprocess.conf | 5 +++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/modules/contextualprocess/contextualprocess.conf b/src/modules/contextualprocess/contextualprocess.conf index 4e9ddea7f..03bfc4e36 100644 --- a/src/modules/contextualprocess/contextualprocess.conf +++ b/src/modules/contextualprocess/contextualprocess.conf @@ -4,18 +4,18 @@ # When a given global value (string) equals a given value, then # the associated command is executed. # -# Configuration consists of keys for global variable names, -# and the sub-keys are strings to compare to the variable's value. -# If the variable has that particular value, the corresponding -# value is executed as a shell command in the target environment. -# -# You can check for an empty value with "". -# # The special configuration key *dontChroot* specifies whether # the commands are run in the target system (default, value *false*), # or in the host system. This key is not used for comparisons # with global configuration values. # +# Configuration consists of keys for global variable names (except +# *dontChroot*), and the sub-keys are strings to compare to the +# variable's value. If the variable has that particular value, the +# corresponding value (script) is executed. +# +# You can check for an empty value with "". +# # If a command starts with "-" (a single minus sign), then the # return value of the command following the - is ignored; otherwise, # a failing command will abort the installation. This is much like @@ -31,6 +31,8 @@ --- dontChroot: false firmwareType: - efi: "-pkg remove efi-firmware" + efi: + - "-pkg remove efi-firmware" + - "-mkinitramfsrd -abgn" bios: "-pkg remove bios-firmware" "": "/bin/false no-firmware-type-set" diff --git a/src/modules/shellprocess/shellprocess.conf b/src/modules/shellprocess/shellprocess.conf index 0825538e1..3735db987 100644 --- a/src/modules/shellprocess/shellprocess.conf +++ b/src/modules/shellprocess/shellprocess.conf @@ -12,6 +12,11 @@ # return value of the command following the - is ignored; otherwise, # a failing command will abort the installation. This is much like # make's use of - in a command. +# +# The value of *script* may be: +# - a single string; this is one command that is executed. +# - a list of strings; these are executed one at a time, by +# separate shells (/bin/sh -c is invoked for each command). --- dontChroot: false script: