From 81008af17b67d2a01ef0c841bfab09eab8928aff Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Thu, 9 Apr 2015 13:24:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculate-utils/calculate-update/.calculate_directory | 1 + profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/43 | 4 ++++ .../calculate-utils/calculate-update/.calculate_directory | 1 + .../templates/deprecated/3.2/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/31 | 4 ++++ 6 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/43 create mode 100644 profiles/templates/deprecated/3.1/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory create mode 100644 profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/31 diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory new file mode 100644 index 000000000..6ed27f12d --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/var/lib/calculate 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 66a83f9d0..f8ca576b2 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 = 42 +remerge = 43 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/43 b/profiles/templates/3.3/6_ac_update_sync/remerge/43 new file mode 100644 index 000000000..7b7bf16b8 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/43 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<42 + +[overlay-calculate] +remerge = 43 diff --git a/profiles/templates/deprecated/3.1/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory b/profiles/templates/deprecated/3.1/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory new file mode 100644 index 000000000..6ed27f12d --- /dev/null +++ b/profiles/templates/deprecated/3.1/2_ac_install_merge/sys-apps/calculate-utils/calculate-update/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/var/lib/calculate diff --git a/profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/00-ini b/profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/00-ini index 876e00bae..8a69572d8 100644 --- a/profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/deprecated/3.2/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 = 30 +remerge = 31 diff --git a/profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/31 b/profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/31 new file mode 100644 index 000000000..70398895d --- /dev/null +++ b/profiles/templates/deprecated/3.2/6_ac_update_sync/remerge/31 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<31 + +[overlay-calculate] +remerge = 31