From d7ae5cbd8f885a99ecd6a165af3cb13986ccb522 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 10 Oct 2011 12:26:00 +0400 Subject: [PATCH] Remove X autologin for CLS. --- install/1live/xorg-server/default/xdm | 2 +- install/1live/xorg-server/default/xdm.del | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/1live/xorg-server/default/xdm b/install/1live/xorg-server/default/xdm index a8c7775..1e6bcf7 100644 --- a/install/1live/xorg-server/default/xdm +++ b/install/1live/xorg-server/default/xdm @@ -1 +1 @@ -# Calculate link=/etc/init.d/xdm symbolic pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||cl_autologin!= +# Calculate link=/etc/init.d/xdm symbolic pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||cl_autologin!=&&os_install_root_type!=livecd diff --git a/install/1live/xorg-server/default/xdm.del b/install/1live/xorg-server/default/xdm.del index 65c2f66..f02cc98 100644 --- a/install/1live/xorg-server/default/xdm.del +++ b/install/1live/xorg-server/default/xdm.del @@ -1 +1 @@ -# Calculate append=remove pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&cl_autologin== +# Calculate append=remove pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&cl_autologin==||pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&os_install_root_type==livecd