From 95aef601f6ddb3c0d4ee34a042d8c85b3a99e341 Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Tue, 2 Sep 2014 11:43:03 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A8=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=B2=D1=82=D0=BE=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3.2.0_beta2/.calculate_directory          |  1 +
 .../3.2.0_beta2/calculate.env                 | 38 +++++++++++++++++++
 .../sys-process/vixie-cron/calculate-update   |  5 +++
 3 files changed, 44 insertions(+)
 create mode 100644 profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/.calculate_directory
 create mode 100644 profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/calculate.env

diff --git a/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/.calculate_directory b/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/.calculate_directory
new file mode 100644
index 000000000..043eadf47
--- /dev/null
+++ b/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip cl_ver>=3.2.0.3&&pkg(sys-apps/calculate-utilities)>=3.2.0_beta2
diff --git a/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/calculate.env b/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/calculate.env
new file mode 100644
index 000000000..7cc72ce64
--- /dev/null
+++ b/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/calculate.env
@@ -0,0 +1,38 @@
+# Calculate format=raw name=calculate.env comment=#
+
+[install]
+#?os_root_type==hdd&&cl_autopartition_set==off#
+os_install_dev_from = #-os_root_dev-#
+#os_root_type#
+#?cl_autopartition_set==on&&os_install_dev_from!=#
+os_install_dev_from = #-os_install_dev_from-#
+#cl_autopartition_set#
+#?os_root_type==hdd#
+os_install_ntp = #-os_install_ntp-#
+#os_root_type#
+os_install_net_settings = #-os_install_net_conf-#
+#?cl_autologin!=&&os_install_linux_shortname!=CMC&&os_install_root_type!=livecd#
+cl_autologin = #-cl_autologin-#
+#cl_autologin#
+#?cl_autologin==&&os_install_linux_shortname==CMC&&os_install_root_type!=livecd#
+cl_autologin =
+#cl_autologin#
+
+[main]
+# Set auto-update configuration files.
+cl_autoupdate_set = off
+#?os_install_root_type!=livecd#
+# keep value of root dev uuid (8 char) for kernel symlink
+cl_kernel_uid = #-cl_install_kernel_uid-#
+#os_install_root_type#
+#?os_install_linux_build!=#
+# current linux build
+os_linux_build = #-os_install_linux_build-#
+#os_install_linux_build#
+cl_home_crypt_set = #-cl_install_home_crypt_set-#
+
+[update]
+# auto-check updates
+cl_update_autocheck_set = #-cl_install_autocheck_set-#
+# interval for update auto-check
+cl_update_autocheck_interval = #-cl_install_autocheck_interval-#
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-process/vixie-cron/calculate-update b/profiles/templates/3.1/3_ac_install_live/1-live/sys-process/vixie-cron/calculate-update
index 92a32731c..9e750a10b 100644
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-process/vixie-cron/calculate-update
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-process/vixie-cron/calculate-update
@@ -6,4 +6,9 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 HOME=/
 
 # check update
+#?pkg(sys-apps/calculate-update)>=3.2.0_beta2#
+#-sum(c,1#-rnd(num,4)-#/170-58)-# * * * *	root	/usr/bin/nice -n19 /usr/sbin/cl-update --schedule -p --wait-another-update off &>/dev/null
+#pkg#
+#?pkg(sys-apps/calculate-update)<3.2.0_beta2#
 #-sum(c,1#-rnd(num,4)-#/170-58)-# * * * *	root	/usr/bin/nice -n19 /usr/sbin/cl-update -p --wait-another-update off &>/dev/null
+#pkg#