Fix disable autologin in domain, dhcpconf for pxe, fix pambase

consolekit.
13 years ago · 7fe06e6cbf
parent 4e548f8e73
commit 7fe06e6cbf
6 changed files with 7 additions and 1 deletions
--- a/client/domain/kdm/kdmrc
+++ b/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=
--- a/install/1merge/pambase/.calculate_directory
+++ b/install/1merge/pambase/.calculate_directory
--- a/install/1merge/pambase/su
+++ b/install/1merge/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#
--- a/install/1merge/pambase/system-auth
+++ b/install/1merge/pambase/system-auth
--- a/install/1merge/pambase/system-login
+++ b/install/1merge/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#
--- a/install/3pxe/dhcpd/dhcpd.conf
+++ b/install/3pxe/dhcpd/dhcpd.conf
@ -1,2 +1,2 @@
 # Calculate format=dhcp
-filename "pxelinux.0"
+filename "pxelinux.0";