From 8b4092298d68b5ffc639725a2c89b5f030d09b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 14 Jan 2019 17:36:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20sys-apps/sysvinit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +- .../3.6/6_ac_update_sync/remerge/2019/.calculate_directory | 1 + profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2019/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2019/20190114 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-#