Merge branch 'develop' of git.calculate.ru:calculate/overlay into develop

profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/ldap.conf

@@ -1 +1 @@
-# Calculate append=remove pkg(sys-apps/calculate-utils[-client])!=&&pkg(sys-apps/calculate-server)==
+# Calculate append=remove force pkg(sys-apps/calculate-utils[-client])!=&&pkg(sys-apps/calculate-server)==

profiles/templates/3.3/3_ac_install_live/1-merge/sys-auth/nss_ldap/undomain/ldap.conf

@@ -1 +1 @@
-# Calculate append=remove client.cl_remote_host==
+# Calculate append=remove force client.cl_remote_host==

profiles/templates/3.3/5_ac_client_undomain/sys-auth/nss_ldap/ldap.conf

@@ -1,2 +1,2 @@
-# Calculate append=remove path=/etc force
+# Calculate append=remove force path=/etc force
 

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 = 40
+remerge = 42

profiles/templates/3.3/6_ac_update_sync/remerge/41

@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-auth/nss_ldap ini(overlay-calculate.remerge)<41
+
+[overlay-calculate]
+remerge = 41

profiles/templates/3.3/6_ac_update_sync/remerge/42

@@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-themes/gnome-themes-standard ini(overlay-calculate.remerge)<42
+
+[overlay-calculate]
+remerge = 42