From 3f8ce499407939cdef488d201e8c851a884dd44a 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: Mon, 30 Dec 2019 16:29:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=85=D0=BE=D0=B4=20=D0=B2=20=D1=81=D0=B5?= =?UTF-8?q?=D0=B0=D0=BD=D1=81=20MATE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * отключен запуск gnome-keyring из pam --- .../templates/3.6/2_ac_install_merge/Depends/gnome-keyring | 1 + .../3.6/2_ac_install_merge/Depends/mate-session-manager | 2 +- .../templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm | 2 ++ profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +- profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 | 4 ++++ 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/gnome-keyring create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-keyring b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-keyring new file mode 100644 index 000000000..bbfc12562 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/Depends/gnome-keyring @@ -0,0 +1 @@ +# Calculate append=skip merge(gnome-base/gnome-keyring)!= merge=x11-misc/lightdm diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager b/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager index 8c4e28aed..852968fbd 100644 --- a/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager +++ b/profiles/templates/3.6/2_ac_install_merge/Depends/mate-session-manager @@ -1 +1 @@ -# Calculate append=skip merge(mate-base/mate-session-manager)!= merge=x11-apps/xinit,x11-drivers/xf86-input-synaptics +# Calculate append=skip merge(mate-base/mate-session-manager)!= merge=x11-apps/xinit,x11-drivers/xf86-input-synaptics,x11-misc/lightdm diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm index 36ebd52a1..306a358e2 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm +++ b/profiles/templates/3.6/2_ac_install_merge/x11-misc/lightdm/lightdm @@ -9,4 +9,6 @@ account include system-login password include system-login session include system-auth +#?pkg(gnome-base/gnome-keyring)!=&&pkg(mate-base/mate-session-manager)==# session optional pam_gnome_keyring.so auto_start +#pkg# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini index ad93b78c6..5b20bcf07 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20191226 +remerge = 20191230 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 new file mode 100644 index 000000000..586f46102 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191230 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=gnome-base/gnome-keyring + +[overlay-calculate] +remerge = #-cl_pass_file-#