Commit graph

511 commits

Author SHA1 Message Date
Francois Dupoux cfcfd6dd7a Merge branch 'lua-config-once' into 'main'
execute sysrescue-configuration.lua only once

See merge request systemrescue/systemrescue-sources!193
2022-05-09 11:26:49 +00:00
Francois Dupoux ada815f07a Merge branch 'yaml-merge' into 'main'
change yaml config loading logic to full merge

See merge request systemrescue/systemrescue-sources!192
2022-05-09 11:26:35 +00:00
Gerd v. Egidy e87660beeb execute sysrescue-configuration.lua only once
Before this patch sysrescue-configuration.lua was executed twice each boot:
(1) during initramfs stage (2) in the regular system as sysrescue-configuration.service

While in theory both runs should create the same output, this isn't guaranteed and
differences could appear for example because of network issues. Finding and debugging
these is difficult because the output of sysrescue-configuration.lua created during
initramfs isn't available anymore when the final system is running.

This patch lets sysrescue-configuration.lua just run once during initramfs. The
output JSON file is then written to the new tmpfs mounted dir /run/archiso/config/.
This dir is also made the new default location for sysrescue-effective-config.json.

A symlink from /etc/sysrescue/sysrescue-effective-config.json to the new location
is created for compatibility with previous releases.
2022-04-25 20:31:18 +02:00
Gerd v. Egidy 0ce5fffa28 add changelog entry 2022-04-24 12:38:57 +02:00
Gerd v. Egidy b11a052e69 change logic of the sysrescuecfg boot command line option: merge instead of replace
When you set a "sysrescuecfg" option on the boot command line before this change,
only the files given on the boot command line were read, not the files in the
sysrescue.d dir. But previous versions of sysrescue-configuration.lua had a set of
built-in default values, these were still used.

Current sysrescue-configuration.lua does not include default values anymore, they
are now all in 100-defaults.yaml. So it is better to always read the default values
from the sysrescue.d dir and just merge files given with the sysrescuecfg option
additionally, with a higher priority.

The sysrescuecfg now also allows absolute paths for local files. When using relative
paths, the common sysrescue.d dirs are prefixed. In this case the file will usually
be loaded again, but at a higher priority.
2022-04-24 01:52:43 +02:00
Gerd v. Egidy 8cb9d2de6b harden sysrescue-autorun sysrescue-initialize.py against missing config values
Until now sysrescue-configuration.lua always ensured the default values were
in the effective JSON config because there was no way to remove them. Now the
lua script is improved to allow full config merging, including a delete function.
This could lead to the user accidently removing a value. The scripts did not
expect this and accessed non existing keys, leading to an exception.

This is fixed with this commit.
2022-04-24 01:08:27 +02:00
Gerd v. Egidy 24529bbb58 change yaml config loading logic to full merge
Previously when loading a YAML config, it overrode single values on the second hierarchy level.
But on all deeper levels new values were completely overwritten. This was inconsistent and poses
a problem for config entries that use these levels, like the ca-trust or the in-development autoterminal.

This change implements full merging of dictionaries on all levels to solve this. Values in files later
in precedence overwrite previous values. If the the old and the new config values are both dictionaries,
then the hierarchy levels are merged down recursively.

You can remove a previously existing dict entry again in a later file by assigning it an empty value.

Also fix handling of invalid YAMLs: ignore them instead of aborting execution
2022-04-23 23:18:23 +02:00
Francois Dupoux f1b7636d5d Merge branch 'acpi' into 'main'
Add acpi package (#280)

See merge request systemrescue/systemrescue-sources!191
2022-04-18 19:44:50 +00:00
Francois Dupoux f79ec4e9c4 Add acpi package (#280) 2022-04-18 20:05:33 +01:00
Francois Dupoux 675945c48e Merge branch 'setkmap-history' into 'main'
store the "setkmap" command in bash_history to make it accessible without typing

See merge request systemrescue/systemrescue-sources!190
2022-04-10 20:12:58 +00:00
Gerd v. Egidy b614840213 store the "setkmap" command in bash_history to make it accessible without typing
When the correct keyboard map is not set yet, it might be difficult for the user
to type in the command. This way they just have to press the arrow up key to reach it.

Fixes #273
2022-04-10 21:56:01 +02:00
Francois Dupoux 4537187dea Merge branch 'checkbin' into 'main'
Update check-binaries.sh script with new custom packages

See merge request systemrescue/systemrescue-sources!189
2022-04-10 18:35:00 +00:00
Francois Dupoux 770fc6bf15 Update check-binaries.sh script with new custom packages 2022-04-10 18:58:54 +01:00
Francois Dupoux 2305ce4bf5 Merge branch 'release902' into 'main'
SystemRescue-9.02

See merge request systemrescue/systemrescue-sources!188
2022-04-09 11:04:09 +00:00
Francois Dupoux 1085cca8a8 SystemRescue-9.02 2022-04-09 11:55:33 +01:00
Francois Dupoux a56da41d76 Merge branch 'readme' into 'main'
explain the use of sysrescuerepo for rebuilding SystemRescue

See merge request systemrescue/systemrescue-sources!187
2022-04-02 14:46:37 +00:00
Gerd v. Egidy 47bc90a08b explain the use of sysrescuerepo for rebuilding SystemRescue 2022-04-02 15:38:33 +02:00
Gerd v. Egidy 62312e703f Merge branch 'branchweb' into 'main'
Use the branch which contains the latest version of the website

See merge request systemrescue/systemrescue-sources!186
2022-04-02 13:23:35 +00:00
Francois Dupoux 01701add58 Use the branch which contains the latest version of the website 2022-04-02 13:27:15 +01:00
Francois Dupoux d671fb198d Merge branch 'load-srm' into 'main'
Add script and config.yaml parameter for late-loading of SystemRescueModules

See merge request systemrescue/systemrescue-sources!185
2022-03-27 14:07:38 +00:00
Gerd v. Egidy a100257d96 Add script and config.yaml parameter for late-loading of SystemRescueModules 2022-03-27 14:07:38 +00:00
Francois Dupoux 7ae051a8ba Merge branch 'usr-os-release' into 'main'
use the same content for /etc/os-release and /usr/lib/os-release

See merge request systemrescue/systemrescue-sources!184
2022-03-09 08:36:34 +00:00
Gerd v. Egidy e42d221593 use the same content for /etc/os-release and /usr/lib/os-release
There seem to be some programs that disregard the os-release standard
and read /usr/lib/os-release even if there is /etc/os-release

Fixes #271
2022-03-08 21:38:22 +01:00
Francois Dupoux a609895dea Merge branch 'docker-cleanup' into 'main'
Remove docker container after the build is complete

See merge request systemrescue/systemrescue-sources!183
2022-02-27 11:51:25 +00:00
Francois Dupoux 80eb4300e4 Remove docker container after the build is complete 2022-02-27 11:50:26 +00:00
Francois Dupoux 718c25f43e Merge branch 'fix-crash-on-i686' into 'main'
Reduce compression ratio for initramfs on i686 to prevent a crash at build time (#261)

See merge request systemrescue/systemrescue-sources!182
2022-02-26 21:25:07 +00:00
Francois Dupoux 48746f8217 Reduce compression ratio for initramfs on i686 to prevent a crash at build time (#261) 2022-02-26 21:25:07 +00:00
Francois Dupoux af582ec23b Merge branch 'docker-i686' into 'main'
Support for building the i686 edition in docker

See merge request systemrescue/systemrescue-sources!181
2022-02-26 17:38:12 +00:00
Francois Dupoux 91b0ce1cb6 Support for building the i686 edition in docker 2022-02-26 17:38:12 +00:00
Francois Dupoux ac6cea3a87 Merge branch 'docker' into 'main'
Add scripts and documentation to help build the ISO image in a docker container

See merge request systemrescue/systemrescue-sources!180
2022-02-26 16:14:18 +00:00
Francois Dupoux 9c46de1bfe Add scripts and documentation to help build the ISO image in a docker container 2022-02-26 16:14:18 +00:00
Francois Dupoux afcebda039 Merge branch 'xorriso-parameter-check' into 'main'
ensure that the installed xorriso version supports the -drive_access parameter

See merge request systemrescue/systemrescue-sources!179
2022-02-23 17:58:17 +00:00
Francois Dupoux 67016a450c Merge branch 'fix-ar-attempts' into 'main'
Fix the type of the default definition of parameter "ar_attempts" (#266)

See merge request systemrescue/systemrescue-sources!178
2022-02-23 07:23:03 +00:00
Francois Dupoux 860df60dab Fix the type of the default definition of parameter "ar_attempts" (#266) 2022-02-23 07:19:31 +00:00
Gerd v. Egidy aa6dac4bb4 ensure that the installed xorriso version supports the -drive_access parameter 2022-02-22 21:11:56 +01:00
Francois Dupoux bd5a7ffca8 Merge branch 'release901' into 'main'
SystemRescue-9.01

See merge request systemrescue/systemrescue-sources!177
2022-02-10 22:04:27 +00:00
Francois Dupoux 5af3ec8cf8 SystemRescue-9.01 2022-02-10 22:03:20 +00:00
Francois Dupoux d8679fabfd Merge branch 'autostart-all-filetypes' into 'main'
Allow all kinds of autorun scripts (#245)

See merge request systemrescue/systemrescue-sources!176
2022-01-31 21:13:27 +00:00
Gerd v. Egidy 78e9f65208 Allow all kinds of autorun scripts (#245) 2022-01-31 21:13:27 +00:00
Francois Dupoux 15cf9b9379 Merge branch 'yaml-cfg-http' into 'master'
Added support for loading remote yaml configuration files over http/https (#254)

See merge request systemrescue/systemrescue-sources!174
2022-01-30 09:17:14 +00:00
Francois Dupoux c15d70c558 Added support for loading remote yaml configuration files over http/https (#254) 2022-01-30 09:17:14 +00:00
Francois Dupoux fcac204d3c Merge branch 'yaml-cfg-refact' into 'master'
Update exit status if there are errors in /usr/bin/sysrescue-configuration.lua

See merge request systemrescue/systemrescue-sources!175
2022-01-29 18:28:19 +00:00
fdupoux 21bd2294db Update exit status if there are errors in /usr/bin/sysrescue-configuration.lua 2022-01-29 17:59:54 +00:00
Francois Dupoux cdfed0bbea Merge branch 'update-changelog' into 'master'
Updated ChangeLog

See merge request systemrescue/systemrescue-sources!173
2022-01-29 13:35:18 +00:00
fdupoux d7468a9263 Updated ChangeLog 2022-01-29 13:34:59 +00:00
Francois Dupoux a96b63ed49 Merge branch 'yaml-filter' into 'master'
Allow to use option sysrescuecfg to restrict which local yaml config files to process (#254)

See merge request systemrescue/systemrescue-sources!172
2022-01-29 12:34:03 +00:00
Francois Dupoux 0f0d899552 Allow to use option sysrescuecfg to restrict which local yaml config files to process (#254) 2022-01-29 12:34:03 +00:00
Francois Dupoux 707046c7ca Merge branch 'search-cmdline' into 'master'
Improve processing of options passed on the boot command line

See merge request systemrescue/systemrescue-sources!171
2022-01-28 22:36:57 +00:00
fdupoux 520b80e65e Improve processing of options passed on the boot command line 2022-01-28 21:50:17 +00:00
Francois Dupoux 194c27d9b5 Merge branch 'generic-yaml-override' into 'master'
Use generic logic for overriding config entries from values in yaml config files (#251)

See merge request systemrescue/systemrescue-sources!170
2022-01-28 20:34:23 +00:00