nchevsky/systemrescue-zfs
1
0
Fork 0
mirror of https://github.com/nchevsky/systemrescue-zfs.git synced 2026-01-02 06:40:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't parse yaml files twice when using copytoram

Browse source 
since recently /run/archiso/copytoram is bind-mounted to /run/archiso/bootmnt.
This means sysrescue-configuration.lua should just load yaml files from
/run/archiso/bootmnt and not both, otherwise they would be loaded twice.
This commit is contained in:
Gerd v. Egidy 2022-10-19 20:20:13 +02:00
parent c0cb014d46
commit 711a9f6ea5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
airootfs/usr/bin/sysrescue-configuration.lua
View file

@ -212,7 +212,8 @@ config = { }
-- Merge one yaml file after the other in lexicographic order
-- ==============================================================================
print ("====> Merging configuration with values from yaml files ...")
confdirs = {"/run/archiso/bootmnt/sysrescue.d", "/run/archiso/copytoram/sysrescue.d"}
-- bootmnt is bind-mounted in case of copytoram, so it doesn't need to be searched explicitly
confdirs = {"/run/archiso/bootmnt/sysrescue.d"}
-- Process local yaml configuration files
for _, curdir in ipairs(confdirs) do