From 301e736bbac75b42522feda25e6b47e95695588a Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Wed, 25 Oct 2023 16:52:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B2=D0=B8=D0=B7=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20net-misc/dhc?= =?UTF-8?q?pcd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/6_ac_update_sync/remerge/0-ini | 2 +- profiles/templates/6_ac_update_sync/remerge/2023/20231025 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/6_ac_update_sync/remerge/2023/20231025 diff --git a/profiles/templates/6_ac_update_sync/remerge/0-ini b/profiles/templates/6_ac_update_sync/remerge/0-ini index edd4b81f4..7ea857007 100644 --- a/profiles/templates/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20230821 +remerge = 20231025 diff --git a/profiles/templates/6_ac_update_sync/remerge/2023/20231025 b/profiles/templates/6_ac_update_sync/remerge/2023/20231025 new file mode 100644 index 000000000..642bc188d --- /dev/null +++ b/profiles/templates/6_ac_update_sync/remerge/2023/20231025 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-misc/dhcpcd + +[overlay-calculate] +remerge = #-cl_pass_file-#