From f9165bc152db9c219f57c6db904ac7839dfe3bd6 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Wed, 14 Dec 2016 01:10:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BD=D1=83=D0=BC=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B2=20remerge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.5/6_ac_update_sync/remerge/0-ini | 2 +- .../3.5/6_ac_update_sync/remerge/10-old/.calculate_directory | 1 + .../3.5/6_ac_update_sync/remerge/{2016/20161213 => 10-old/6} | 0 profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 | 4 ++++ 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory rename profiles/templates/3.5/6_ac_update_sync/remerge/{2016/20161213 => 10-old/6} (100%) create mode 100644 profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini index 4e8a13b..c9923f5 100644 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-distros] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20161213 +remerge = 20160101 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory new file mode 100644 index 0000000..0a8a959 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-distros.remerge)<100 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213 b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/6 similarity index 100% rename from profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161213 rename to profiles/templates/3.5/6_ac_update_sync/remerge/10-old/6 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 new file mode 100644 index 0000000..bf1bb21 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-distros.remerge)<#-cut()-# + +[overlay-distros] +remerge = 20160101