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 4b739f435..b4202781d 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 = 20181227 +remerge = 20181227.1 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227 index e821c1745..c5a2eb2b7 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227 +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227 @@ -1,4 +1,4 @@ -# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/baselayout +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/sysvinit [overlay-calculate] remerge = #-cl_pass_file-# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227.1 new file mode 100644 index 000000000..e821c1745 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2018/20181227.1 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-apps/baselayout + +[overlay-calculate] +remerge = #-cl_pass_file-#