Добавлена настройка запуска сессии Plasma через startx и xautologin

9 years ago · 72f6d99384
parent 5973407dc6
commit 72f6d99384
6 changed files with 12 additions and 1 deletions
--- a/profiles/templates/3.3/2_ac_install_merge/Depends/plasma-workspace
+++ b/profiles/templates/3.3/2_ac_install_merge/Depends/plasma-workspace
@ -0,0 +1 @@
+# Calculate append=skip merge(kde-plasma/plasma-workspace)!= merge=x11-apps/xinit
--- a/profiles/templates/3.3/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
+++ b/profiles/templates/3.3/2_ac_install_merge/kde-plasma/plasma-workspace/.calculate_directory
@ -0,0 +1 @@
+# Calculate merge()!=&&pkg()!= path=/etc/X11 name=Sessions
--- a/profiles/templates/3.3/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
+++ b/profiles/templates/3.3/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma
@ -0,0 +1,2 @@
+# Calculate chmod=0755
+startkde
--- a/profiles/templates/3.3/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
+++ b/profiles/templates/3.3/2_ac_install_merge/x11-apps/xinit/env.d/90xsession
@ -15,3 +15,6 @@ XSESSION="Mate"
 #?pkg(kde-base/ksmserver)!=#
 XSESSION="KDE-4"
 #pkg#
+#?pkg(kde-plasma/plasma-workspace)!=#
+XSESSION="Plasma"
+#pkg#
--- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini
+++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-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 = 65
+remerge = 66
--- a/profiles/templates/3.3/6_ac_update_sync/remerge/66
+++ b/profiles/templates/3.3/6_ac_update_sync/remerge/66
@ -0,0 +1,4 @@
+# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-apps/xinit,kde-plasma/plasma-workspace ini(overlay-calculate.remerge)<66
+
+[overlay-calculate]
+remerge = 66
				`@ -0,0 +1 @@`
				`# Calculate append=skip merge(kde-plasma/plasma-workspace)!= merge=x11-apps/xinit`
				`@ -0,0 +1 @@`
				`# Calculate merge()!=&&pkg()!= path=/etc/X11 name=Sessions`