From f1110ca84c6e4b183f307b391f8b9e55bacc6db6 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: Wed, 24 Feb 2016 16:45:55 +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=20bash=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20xz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh | 2 +- .../3.3/6_ac_update_sync/remerge/0-99/.calculate_directory | 1 + profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/01 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/02 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/03 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/04 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/05 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/06 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/09 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/10 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/11 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/12 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/13 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/15 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/17 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/20 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/21 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/22 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/23 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/24 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/26 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/27 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/29 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/30 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/31 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/34 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/35 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/36 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/41 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/42 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/43 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/44 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/45 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/46 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/47 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/48 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/50 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/51 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/52 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/53 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/55 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/57 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/58 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/59 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/60 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/63 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/65 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/66 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/67 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/68 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/70 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/71 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/72 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/73 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/74 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/76 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/77 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/78 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/79 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/80 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/83 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/85 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/86 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/88 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/89 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/90 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/91 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/92 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/93 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/94 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/95 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/96 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/97 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/98 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/99 | 0 profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- .../3.3/6_ac_update_sync/remerge/100-199/.calculate_directory | 1 + profiles/templates/3.3/6_ac_update_sync/remerge/100-199/100 | 4 ++++ 78 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/0-99/.calculate_directory rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/01 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/02 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/03 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/04 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/05 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/06 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/09 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/10 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/11 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/12 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/13 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/15 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/17 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/20 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/21 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/22 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/23 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/24 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/26 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/27 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/29 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/30 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/31 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/34 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/35 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/36 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/41 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/42 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/43 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/44 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/45 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/46 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/47 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/48 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/50 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/51 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/52 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/53 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/55 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/57 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/58 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/59 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/60 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/63 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/65 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/66 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/67 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/68 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/70 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/71 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/72 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/73 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/74 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/76 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/77 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/78 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/79 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/80 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/83 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/85 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/86 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/88 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/89 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/90 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/91 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/92 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/93 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/94 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/95 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/96 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/97 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/98 (100%) rename profiles/templates/3.3/6_ac_update_sync/remerge/{ => 0-99}/99 (100%) create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/100-199/.calculate_directory create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/100-199/100 diff --git a/profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh b/profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh index 392c160e3..9f8d1821d 100644 --- a/profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh +++ b/profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh @@ -1,4 +1,4 @@ # Calculate comment=# #!/bin/bash -XZ_OPT="--threads=0" +export XZ_OPT="--threads=0" diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/.calculate_directory b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/.calculate_directory new file mode 100644 index 000000000..1ea3e2b95 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-calculate.remerge)<100 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/01 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/01 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/01 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/01 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/02 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/02 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/02 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/02 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/03 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/03 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/03 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/03 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/04 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/04 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/04 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/04 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/05 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/05 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/05 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/05 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/06 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/06 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/06 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/06 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/09 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/09 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/09 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/09 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/10 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/10 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/10 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/10 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/11 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/11 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/11 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/11 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/12 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/12 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/12 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/12 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/13 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/13 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/13 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/13 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/15 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/15 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/15 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/15 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/17 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/17 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/17 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/17 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/20 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/20 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/20 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/20 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/21 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/21 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/21 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/21 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/22 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/22 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/22 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/22 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/23 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/23 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/23 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/23 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/24 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/24 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/24 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/24 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/26 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/26 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/26 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/26 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/27 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/27 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/27 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/27 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/29 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/29 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/29 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/29 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/30 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/30 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/30 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/30 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/31 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/31 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/31 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/31 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/34 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/34 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/34 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/34 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/35 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/35 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/35 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/35 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/36 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/36 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/36 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/36 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/41 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/41 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/41 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/41 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/42 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/42 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/42 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/42 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/43 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/43 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/43 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/43 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/44 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/44 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/44 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/44 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/45 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/45 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/45 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/45 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/46 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/46 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/46 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/46 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/47 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/47 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/47 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/47 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/48 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/48 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/48 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/48 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/50 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/50 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/50 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/50 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/51 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/51 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/51 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/51 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/52 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/52 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/52 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/52 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/53 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/53 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/53 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/53 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/55 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/55 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/55 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/55 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/57 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/57 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/57 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/57 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/58 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/58 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/58 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/58 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/59 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/59 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/59 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/59 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/60 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/60 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/60 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/60 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/63 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/63 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/63 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/63 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/65 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/65 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/65 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/65 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/66 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/66 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/66 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/66 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/67 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/67 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/67 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/67 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/68 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/68 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/68 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/68 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/70 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/70 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/70 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/70 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/71 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/71 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/71 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/71 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/72 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/72 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/72 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/72 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/73 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/73 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/73 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/73 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/74 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/74 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/74 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/74 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/76 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/76 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/76 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/76 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/77 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/77 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/77 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/77 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/78 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/78 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/78 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/78 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/79 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/79 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/79 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/79 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/80 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/80 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/80 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/80 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/83 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/83 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/83 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/83 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/85 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/85 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/85 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/85 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/86 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/86 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/86 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/86 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/88 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/88 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/88 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/88 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/89 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/89 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/89 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/89 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/90 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/90 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/90 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/90 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/91 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/91 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/91 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/91 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/92 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/92 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/92 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/92 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/93 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/93 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/93 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/93 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/94 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/94 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/94 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/94 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/95 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/95 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/95 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/95 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/96 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/96 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/96 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/96 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/97 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/97 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/97 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/97 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/98 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/98 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/98 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/98 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/99 b/profiles/templates/3.3/6_ac_update_sync/remerge/0-99/99 similarity index 100% rename from profiles/templates/3.3/6_ac_update_sync/remerge/99 rename to profiles/templates/3.3/6_ac_update_sync/remerge/0-99/99 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index bfb81a8c4..243ff46c6 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-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 = 96 +remerge = 100 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/100-199/.calculate_directory b/profiles/templates/3.3/6_ac_update_sync/remerge/100-199/.calculate_directory new file mode 100644 index 000000000..ef7855402 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/100-199/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-calculate.remerge)>=100&&ini(overlay-calculate.remerge)<200 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/100-199/100 b/profiles/templates/3.3/6_ac_update_sync/remerge/100-199/100 new file mode 100644 index 000000000..9016e4e17 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/100-199/100 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=app-shells/bash ini(overlay-calculate.remerge)<100 + +[overlay-calculate] +remerge = 100