From c4dc5c4086bb30adbc5b703921aa865327b281a6 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 9 Jun 2010 09:35:01 +0400 Subject: [PATCH 1/2] Fix kdmrc for minimal UID --- desktop/system/install/usr/share/config/kdm/kdmrc | 14 ++++++++++++++ .../system/uninstall/usr/share/config/kdm/kdmrc | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/desktop/system/install/usr/share/config/kdm/kdmrc b/desktop/system/install/usr/share/config/kdm/kdmrc index 0b198d5..f0acd25 100644 --- a/desktop/system/install/usr/share/config/kdm/kdmrc +++ b/desktop/system/install/usr/share/config/kdm/kdmrc @@ -2,3 +2,17 @@ [X-*-Core] Reset=/usr/share/calculate-2.2/xdm/xdm --logout Startup=/usr/share/calculate-2.2/xdm/xdm --login +#?env(client.cl_remote_host)!= +Setup=/usr/share/calculate-2.2/xdm/wait_domain +#env# +#?env(client.cl_remote_host)== +Setup=/usr/share/config/kdm/Xsetup +#env# + +[X-*-Greeter] +#?env(client.cl_remote_host)!= +MinShowUID=1000 +#env# +#?env(client.cl_remote_host)== +MinShowUID=999 +#env# diff --git a/desktop/system/uninstall/usr/share/config/kdm/kdmrc b/desktop/system/uninstall/usr/share/config/kdm/kdmrc index 6876f9f..e33ebea 100644 --- a/desktop/system/uninstall/usr/share/config/kdm/kdmrc +++ b/desktop/system/uninstall/usr/share/config/kdm/kdmrc @@ -2,3 +2,17 @@ [X-*-Core] Reset=/usr/share/config/kdm/Xreset Startup=/usr/share/config/kdm/Xstartup +#?env(client.cl_remote_host)!= +Setup=/usr/share/calculate-2.2/xdm/wait_domain +#env# +#?env(client.cl_remote_host)== +Setup=/usr/share/config/kdm/Xsetup +#env# + +[X-*-Greeter] +#?env(client.cl_remote_host)!= +MinShowUID=1000 +#env# +#?env(client.cl_remote_host)== +MinShowUID=999 +#env# From bb346f7cb4899460720b29e0cc9848255991b39e Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 9 Jun 2010 10:55:22 +0400 Subject: [PATCH 2/2] Restore kdmrc template --- desktop/system/install/usr/share/config/kdm/kdmrc | 14 -------------- .../system/uninstall/usr/share/config/kdm/kdmrc | 13 ------------- 2 files changed, 27 deletions(-) diff --git a/desktop/system/install/usr/share/config/kdm/kdmrc b/desktop/system/install/usr/share/config/kdm/kdmrc index f0acd25..0b198d5 100644 --- a/desktop/system/install/usr/share/config/kdm/kdmrc +++ b/desktop/system/install/usr/share/config/kdm/kdmrc @@ -2,17 +2,3 @@ [X-*-Core] Reset=/usr/share/calculate-2.2/xdm/xdm --logout Startup=/usr/share/calculate-2.2/xdm/xdm --login -#?env(client.cl_remote_host)!= -Setup=/usr/share/calculate-2.2/xdm/wait_domain -#env# -#?env(client.cl_remote_host)== -Setup=/usr/share/config/kdm/Xsetup -#env# - -[X-*-Greeter] -#?env(client.cl_remote_host)!= -MinShowUID=1000 -#env# -#?env(client.cl_remote_host)== -MinShowUID=999 -#env# diff --git a/desktop/system/uninstall/usr/share/config/kdm/kdmrc b/desktop/system/uninstall/usr/share/config/kdm/kdmrc index e33ebea..63638f9 100644 --- a/desktop/system/uninstall/usr/share/config/kdm/kdmrc +++ b/desktop/system/uninstall/usr/share/config/kdm/kdmrc @@ -2,17 +2,4 @@ [X-*-Core] Reset=/usr/share/config/kdm/Xreset Startup=/usr/share/config/kdm/Xstartup -#?env(client.cl_remote_host)!= -Setup=/usr/share/calculate-2.2/xdm/wait_domain -#env# -#?env(client.cl_remote_host)== -Setup=/usr/share/config/kdm/Xsetup -#env# -[X-*-Greeter] -#?env(client.cl_remote_host)!= -MinShowUID=1000 -#env# -#?env(client.cl_remote_host)== -MinShowUID=999 -#env#