From fd2f317aa7596be300c9821a65882cb45021a10b Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Fri, 8 Mar 2024 00:54:44 +0300 Subject: [PATCH] add vendorclassid to dhcpcd --- .../templates/2_ac_install_merge/net-misc/dhcpcd/dhcpcd.conf | 5 +++++ profiles/templates/6_ac_update_sync/remerge/0-ini | 2 +- .../6_ac_update_sync/remerge/2024/.calculate_directory | 1 + profiles/templates/6_ac_update_sync/remerge/2024/20230308 | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/6_ac_update_sync/remerge/2024/.calculate_directory create mode 100644 profiles/templates/6_ac_update_sync/remerge/2024/20230308 diff --git a/profiles/templates/2_ac_install_merge/net-misc/dhcpcd/dhcpcd.conf b/profiles/templates/2_ac_install_merge/net-misc/dhcpcd/dhcpcd.conf index d7e363490..d5d1a3425 100644 --- a/profiles/templates/2_ac_install_merge/net-misc/dhcpcd/dhcpcd.conf +++ b/profiles/templates/2_ac_install_merge/net-misc/dhcpcd/dhcpcd.conf @@ -1,3 +1,8 @@ # Calculate format=dhcp path=/etc hostname +#?os_install_linux_subname!=# +vendorclassid #-os_install_linux_name-# #-os_install_linux_ver-# #-os_install_linux_subname-# +#!os_install_linux_subname# +vendorclassid #-os_install_linux_name-# #-os_install_linux_ver-# +#os_install_linux_subname# diff --git a/profiles/templates/6_ac_update_sync/remerge/0-ini b/profiles/templates/6_ac_update_sync/remerge/0-ini index 7ea857007..c5935ba87 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 = 20231025 +remerge = 20240308 diff --git a/profiles/templates/6_ac_update_sync/remerge/2024/.calculate_directory b/profiles/templates/6_ac_update_sync/remerge/2024/.calculate_directory new file mode 100644 index 000000000..b7586de24 --- /dev/null +++ b/profiles/templates/6_ac_update_sync/remerge/2024/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-calculate.remerge)<20250101 diff --git a/profiles/templates/6_ac_update_sync/remerge/2024/20230308 b/profiles/templates/6_ac_update_sync/remerge/2024/20230308 new file mode 100644 index 000000000..642bc188d --- /dev/null +++ b/profiles/templates/6_ac_update_sync/remerge/2024/20230308 @@ -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-#