From 711a9f6ea500d2de510d2c262ef907614d504fbf Mon Sep 17 00:00:00 2001 From: "Gerd v. Egidy" Date: Wed, 19 Oct 2022 20:20:13 +0200 Subject: [PATCH] don't parse yaml files twice when using copytoram 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. --- airootfs/usr/bin/sysrescue-configuration.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/airootfs/usr/bin/sysrescue-configuration.lua b/airootfs/usr/bin/sysrescue-configuration.lua index 49e8626..5f82e30 100755 --- a/airootfs/usr/bin/sysrescue-configuration.lua +++ b/airootfs/usr/bin/sysrescue-configuration.lua @@ -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