From a1324235ec785d4d5b8243b0bd12a9cd06abe7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 25 Apr 2019 14:36:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B0=20pam=5Felogind=20=D0=BF=D1=80=D0=B8=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20gnome-session?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/3.6/2_ac_install_merge/Depends/gnome-session | 2 +- .../3.6/2_ac_install_merge/sys-auth/pambase/system-auth | 2 +- .../3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession | 3 +++ .../x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop | 4 ++-- .../3_ac_install_live/1-merge/sys-auth/pambase/system-auth | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-session b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-session index 87ca27bc4..f1dcd6383 100644 --- a/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-session +++ b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-session @@ -1 +1 @@ -# Calculate append=skip merge(gnome-base/gnome-session)!= merge=kde-base/kdm +# Calculate append=skip merge(gnome-base/gnome-session)!= merge=x11-apps/xinit,x11-drivers/xf86-input-synaptics,sys-auth/pambase diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth index 086c24c30..4236b55c8 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth +++ b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth @@ -9,7 +9,7 @@ password sufficient pam_unix.so nullok sha256 shadow use_authtok password required pam_deny.so session required pam_limits.so -#?pkg(sys-auth/elogind)!=&&pkg(gnome-extra/cinnamon-session)!=# +#?pkg(sys-auth/elogind)!=&&pkg(gnome-extra/cinnamon-session)!=||pkg(sys-auth/elogind)!=&&pkg(gnome-base/gnome-session)!=# -session optional pam_loginuid.so -session optional pam_elogind.so #pkg# diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession index be3d47943..3386760ae 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession +++ b/profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/env.d/90xsession @@ -6,6 +6,9 @@ XSESSION="Kodi" #?pkg(x11-wm/openbox)!=# XSESSION="openbox" #pkg# +#?pkg(gnome-base/gnome-session)!=# +XSESSION="gnome" +#pkg# #?pkg(gnome-extra/cinnamon-session)!=# XSESSION="cinnamon-session" #pkg# diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop index 1749739af..8bf094370 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop +++ b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/xf86-input-synaptics/touchpad-tapfix.desktop @@ -2,11 +2,11 @@ Type=Application Name=Touchpad Tap fix Exec=/usr/libexec/calculate/fix-touchpad.sh -#?pkg(mate-base/mate-session-manager)!=||pkg(gnome-extra/cinnamon-session)!=# +#?pkg(mate-base/mate-session-manager)!=||pkg(gnome-extra/cinnamon-session)!=||pkg(gnome-base/gnome-session)!=# OnlyShowIn=MATE;X-Cinnamon; #pkg# NoDisplay=true -#?pkg(gnome-extra/cinnamon-session)!=# +#?pkg(gnome-extra/cinnamon-session)!=||pkg(gnome-base/gnome-session)!=# X-GNOME-Autostart-Notify=false X-GNOME-AutoRestart=false #pkg# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth index 2a06cdf4d..946f80f66 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth @@ -44,7 +44,7 @@ password required pam_deny.so session required pam_env.so session required pam_limits.so -#?pkg(sys-auth/elogind)!=&&pkg(gnome-extra/cinnamon-session)!=# +#?pkg(sys-auth/elogind)!=&&pkg(gnome-extra/cinnamon-session)!=||pkg(sys-auth/elogind)!=&&pkg(gnome-base/gnome-session)!=# -session optional pam_loginuid.so -session optional pam_elogind.so #pkg#