Merge branch 'master' of git.calculate.ru:calculate-2.2/calculate-templates

client/domain/kdm/kdmrc

@@ -8,5 +8,6 @@ MinShowUID=#-env(unix.sr_unix_min_id)-#
 #?env(unix.sr_unix_min_id)==#
 MinShowUID=1000
 #env#
+[X-:0-Core]
 AutoLoginEnable=false
 AutoLoginUser=

client/undomain/calculate-client/.calculate_directory

@@ -0,0 +1,2 @@
+# Calculate belong()!=&&pkg(sys-apps/calculate-client)!= name=etc append=skip
+

client/undomain/calculate-client/reconfigurePackages

@@ -1,4 +1,5 @@
 # Calculate path=/tmp name=reconfigureXorg exec=/bin/bash os_root_type==livecd
 
+# reconfigure conf.d/xdm after undomain action on livecd
 cl-template -l all --merge x11-base/xorg-server &>/dev/null
 true

client/undomain/xorg-server/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(x11-base/xorg-server)!= name=etc
-

install/1live/pambase/su

@@ -30,4 +30,6 @@ session    include      system-auth
 session    required     pam_env.so
 session    optional     pam_xauth.so
 # need for xautologin
+#?pkg(sys-auth/consolekit)!=#
 session    optional     pam_ck_connector.so nox11
+#pkg#

install/1live/pambase/system-login

@@ -19,3 +19,6 @@ session		include		system-auth
 session		optional	pam_mail.so
 # need for xsesstion run by startx
 session		optional	pam_ck_connector.so
+#?pkg(sys-auth/consolekit)!=#
+session    optional     pam_ck_connector.so nox11
+#pkg#

install/3pxe/dhcpd/dhcpd.conf

@@ -1,2 +1,2 @@
 # Calculate format=dhcp
-filename "pxelinux.0"
+filename "pxelinux.0";