update masks, fix template

1 month ago · 60fdec8e33
parent 54bc6fdd3c
commit 60fdec8e33
4 changed files with 21 additions and 57 deletions
--- a/profiles/default/package.mask
+++ b/profiles/default/package.mask
@ -9,4 +9,3 @@ sys-libs/db:6.0


 =sys-apps/calculate-utils-3.7.5.7
-~x11-misc/sddm-0.20.0
--- a/profiles/templates/3_ac_install_live/1-merge/gui-libs/display-manager-init/.calculate_directory
+++ b/profiles/templates/3_ac_install_live/1-merge/gui-libs/display-manager-init/.calculate_directory
@ -1,2 +1,2 @@
-# Calculate mergepkg()!= name=etc
+# Calculate mergepkg()!= append=skip

--- a/profiles/templates/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager
+++ b/profiles/templates/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager
@ -1,55 +0,0 @@
-# Calculate comment=#
-
-CHECKVT=7
-
-#?module(client)!=&&client.os_remote_auth!=#
-#?pkg(x11-misc/sddm)!=#
-DISPLAYMANAGER="sddm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(x11-misc/lightdm)!=&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="lightdm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(gnome-base/gdm)!=&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="gdm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(x11-misc/slim)!=&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="slim"
-START_STOP_ARGS=
-#pkg#
-#!module#
-#?cl_autologin!=#
-#?pkg(x11-misc/lightdm)!=#
-DISPLAYMANAGER="lightdm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)!=#
-DISPLAYMANAGER="sddm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
-XUSER=#-cl_autologin-#
-DISPLAYMANAGER="bash"
-START_STOP_ARGS="--background -- /usr/bin/xautologin $XUSER $CHECKVT"
-#pkg#
-#!cl_autologin#
-#?pkg(x11-misc/sddm)!=#
-DISPLAYMANAGER="sddm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(x11-misc/lightdm)!=&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="lightdm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(gnome-base/gdm)!=&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="gdm"
-START_STOP_ARGS=
-#pkg#
-#?pkg(x11-misc/slim)!=&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==#
-DISPLAYMANAGER="slim"
-START_STOP_ARGS=
-#pkg#
-#cl_autologin#
-#module#
--- a/profiles/templates/3_ac_install_live/1-merge/gui-libs/display-manager-init/display-manager
+++ b/profiles/templates/3_ac_install_live/1-merge/gui-libs/display-manager-init/display-manager
@ -0,0 +1,20 @@
+# Calculate path=/etc/conf.d comment=#
+
+CHECKVT=7
+
+#?pkg(x11-misc/sddm)!=#
+DISPLAYMANAGER="sddm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(gnome-base/gdm)!=#
+DISPLAYMANAGER="gdm"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/slim)!=#
+DISPLAYMANAGER="slim"
+START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/lightdm)!=#
+DISPLAYMANAGER="lightdm"
+START_STOP_ARGS=
+#pkg#