[shellprocess] Introduce configuration for verbosity

This commit is contained in:
Adriaan de Groot 2024-05-25 22:27:47 +02:00
parent 48554cf310
commit f9f888fade
2 changed files with 25 additions and 3 deletions

View File

@ -84,8 +84,20 @@
--- ---
# Set to true to run in host, rather than target system # Set to true to run in host, rather than target system
dontChroot: false dontChroot: false
# Tune this for the commands you're actually running
# timeout: 10 # Tune this for the commands you're actually running, or
# use the list-of-items form of commands to tune the timeout
# for each command individually.
timeout: 10
# This will copy the output from the command into the Calamares
# log file. No processing is done beyond log-each-line-separately,
# so this can introduce weirdness in the log if the script
# outputs e.g. escape codes.
#
# The default is `false`. This can also be set for each
# command individually.
verbose: false
# Script may be a single string (because false returns an error exit # Script may be a single string (because false returns an error exit
# code, this will trigger a failure in the installation): # code, this will trigger a failure in the installation):
@ -109,6 +121,8 @@ script:
- "/usr/bin/true" - "/usr/bin/true"
- command: "/usr/local/bin/slowloris" - command: "/usr/local/bin/slowloris"
timeout: 3600 timeout: 3600
- command: "echo -e '\e[33;2mred\e[33;0m'"
verbose: true
# You can change the description of the job (as it is displayed in the # You can change the description of the job (as it is displayed in the
# progress bar during installation) by defining an *i18n* key, which # progress bar during installation) by defining an *i18n* key, which

View File

@ -19,7 +19,10 @@ definitions:
timeout: timeout:
type: number type: number
description: the (optional) timeout for this specific command (differently description: the (optional) timeout for this specific command (differently
from the global setting) from the global setting).
verbose:
type: boolean
description: when true, log output from the command to the Calamares log.
required: required:
- command - command
type: object type: object
@ -34,6 +37,9 @@ properties:
type: number type: number
description: The (global) timeout for the command list in seconds. If unset, defaults description: The (global) timeout for the command list in seconds. If unset, defaults
to 30 seconds. to 30 seconds.
verbose:
type: boolean
description: when true, log output from the command to the Calamares log.
script: script:
anyOf: anyOf:
- $ref: '#definitions/command' - $ref: '#definitions/command'
@ -55,3 +61,5 @@ properties:
type: string type: string
required: required:
- name - name
required:
- script