calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 1 Releases Wiki Activity

Переход на display-manager-init

Browse Source
mhiretskiy
Хирецкий Михаил 3 years ago
parent 229463e5bd
commit c1c9d9460a
23 changed files with 94 additions and 12 deletions
Show Stats Download Patch File Download Diff File

3
profiles/default/package.mask
Unescape View File

@ -1,6 +1,3 @@
=x11-base/xorg-server-1.20.10-r3
=x11-apps/xinit-1.4.1-r1
sci-libs/blas-reference
sci-libs/cblas-reference
sci-libs/lapack-reference

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

2
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/.calculate_directory
Unescape View File

@ -0,0 +1,2 @@
# Calculate mergepkg()!= name=etc

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate path=/etc/runlevels

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager
Unescape View File

@ -0,0 +1 @@
# Calculate link=/etc/init.d/display-manager symbolic pkg(x11-misc/sddm)!=||pkg(x11-misc/lightdm)!=||pkg(gnome-base/gdm)!=||pkg(kde-base/kdm)!=||pkg(x11-misc/slim)!=||pkg(media-tv/xbmc)!=||pkg(media-tv/kodi)!=||cl_autologin!=&&os_install_root_type!=livecd

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/boot/display-manager.del
Unescape View File

@ -0,0 +1 @@
# Calculate append=remove name=display-manager pkg(x11-misc/sddm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(kde-base/kdm)==&&pkg(x11-misc/slim)==&&pkg(media-tv/xbmc)==&&pkg(media-tv/kodi)== cl_autologin==||os_install_root_type==livecd

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate path=/etc/runlevels

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/default/display-manager.del
Unescape View File

@ -0,0 +1 @@
# Calculate append=remove name=display-manager

6
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/init.d/display-manager
Unescape View File

@ -0,0 +1,6 @@
# Calculate format=patch
<reg> rm /etc/.nogui
return 0</reg>
<text> rm /etc/.nogui
chvt 1
return 0</text>

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate path=/etc name=X11

2
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/0-fix-contents
Unescape View File

@ -0,0 +1,2 @@
# Calculate format=contents
!x11-apps/xinit /etc/X11/startDM*

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/1-remove-old
Unescape View File

@ -0,0 +1 @@
# Calculate append=remove name=startDM.sh

1
profiles/templates/3.6/2_ac_install_merge/gui-libs/display-manager-init/startDM.sh/2-symlink
Unescape View File

@ -0,0 +1 @@
# Calculate name=startDM.sh link=/usr/bin/startDM symbolic force

2
profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/0-clean-startDM.sh
Unescape View File

@ -1,4 +1,4 @@
# Calculate run=/bin/bash ac_install_disk==off
# Calculate run=/bin/bash ac_install_disk==off&&pkg(x11-apps/xinit)<1.4.1-r1&&pkg(gui-libs/display-manager-init)==
rm -f /etc/X11/startDM.sh
rm -f /etc/X11/._cfg000*_startDM.sh

2
profiles/templates/3.6/2_ac_install_merge/x11-apps/xinit/X11/startDM.sh
Unescape View File

@ -1,4 +1,4 @@
# Calculate comment=# chmod=0755 protected
# Calculate comment=# chmod=0755 protected pkg(x11-apps/xinit)<1.4.1-r1&&pkg(gui-libs/display-manager-init)==
#!/bin/sh
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2

3
profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
Unescape View File

@ -1,2 +1 @@
# Calculate path=/etc/runlevels
# Calculate path=/etc/runlevels pkg(x11-base/xorg-server)<1.20.10-r3

3
profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
Unescape View File

@ -1,2 +1 @@
# Calculate path=/etc/runlevels
# Calculate path=/etc/runlevels pkg(x11-base/xorg-server)<1.20.10-r3

1
profiles/templates/3.6/2_ac_install_merge/x11-base/xorg-server/init.d/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate pkg(x11-base/xorg-server)<1.20.10-r3

1
profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate append=skip

2
profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/.calculate_directory
Unescape View File

@ -0,0 +1,2 @@
# Calculate mergepkg()!= name=etc

63
profiles/templates/3.6/3_ac_install_live/1-merge/gui-libs/display-manager-init/conf.d/display-manager
Unescape View File

@ -0,0 +1,63 @@
# Calculate comment=#
CHECKVT=7
#?module(client)!=&&client.os_remote_auth!=#
#?pkg(x11-misc/sddm)!=#
DISPLAYMANAGER="sddm"
START_STOP_ARGS=
#pkg#
#?pkg(kde-base/kdm)!=&&pkg(x11-misc/sddm)==#
DISPLAYMANAGER="kdm"
START_STOP_ARGS=
#pkg#
#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==#
DISPLAYMANAGER="lightdm"
START_STOP_ARGS=
#pkg#
#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
DISPLAYMANAGER="gdm"
START_STOP_ARGS=
#pkg#
#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&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(kde-base/kdm)!=&&pkg(x11-misc/sddm)==#
DISPLAYMANAGER="kdm"
START_STOP_ARGS=
#pkg#
#?pkg(x11-misc/lightdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/sddm)==#
DISPLAYMANAGER="lightdm"
START_STOP_ARGS=
#pkg#
#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)==#
DISPLAYMANAGER="gdm"
START_STOP_ARGS=
#pkg#
#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(x11-misc/lightdm)==&&pkg(gnome-base/gdm)==&&pkg(x11-misc/sddm)==#
DISPLAYMANAGER="slim"
START_STOP_ARGS=
#pkg#
#cl_autologin#
#module#

1
profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/.calculate_directory
Unescape View File

@ -0,0 +1 @@
# Calculate pkg(x11-base/xorg-server)<1.20.10-r3

6
profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
Unescape View File

@ -51,12 +51,12 @@ cld-nox;
#?pkg(sys-kernel/dracut)==#root=/dev/ram0#!pkg#root=#-cl_builder_root_param-##pkg#;
/boot/initrd;
#?pkg(media-gfx/splashutils)!=#
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 nox;
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 nogui;
#pkg#
#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
#-load(/bootmenu/bootparam.config)-# splash nox;
#-load(/bootmenu/bootparam.config)-# splash nogui;
#pkg#
#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose nox;
#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose nogui;
#pkg#
FOOTER

Write Preview
Loading…
Cancel
Save