diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini index c8b498781..a3c1bf138 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.6/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 = 20181228 +remerge = 20190114 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/.calculate_directory new file mode 100644 index 000000000..997969b3a --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-calculate.remerge)<20200101 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 new file mode 100644 index 000000000..c5a2eb2b7 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/sysvinit + +[overlay-calculate] +remerge = #-cl_pass_file-#