diff options
| -rw-r--r-- | gui-libs/display-manager-init/Manifest | 7 | ||||
| -rw-r--r-- | gui-libs/display-manager-init/display-manager-init-1.0-r10.ebuild | 37 | ||||
| -rw-r--r-- | gui-libs/display-manager-init/files/display-manager-setup.initd (renamed from x11-base/xorg-server/files/xdm-setup.initd-1) | 6 | ||||
| -rw-r--r-- | gui-libs/display-manager-init/files/display-manager.confd | 13 | ||||
| -rw-r--r-- | gui-libs/display-manager-init/files/display-manager.initd (renamed from x11-base/xorg-server/files/xdm.initd-11) | 50 | ||||
| -rw-r--r-- | gui-libs/display-manager-init/files/startDM | 29 | ||||
| -rw-r--r-- | gui-libs/display-manager-init/files/xdm.initd | 13 | ||||
| -rw-r--r-- | gui-libs/display-manager-init/metadata.xml | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xdm.confd-4 | 10 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.10-r100.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.10-r10.ebuild) | 5 |
10 files changed, 138 insertions, 40 deletions
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest new file mode 100644 index 00000000..24989ab2 --- /dev/null +++ b/gui-libs/display-manager-init/Manifest @@ -0,0 +1,7 @@ +AUX display-manager-setup.initd 224 BLAKE2B 8513295b8c315d71521ac24fc9da1878e32044ebe7b6e37afb77a25eb8ec449568a82e516fd04de7fb2b0f0b5ff355a54a257041616d0035b25d0ae191e336e4 SHA512 d0048fc5b3c0fd92a44b71f7b8132e35787e42095c22f53aa41c10505c219eb25015f76163069aab7ebb6f0ac9feeac62d1b74682fd3947e835ea5de36957727 +AUX display-manager.confd 608 BLAKE2B 814b4d36ce74d2f70a771cda31c3b9f6e21246bef681607d2687b3ed51f1baab8752fe94ad1021b9fd81b3e8444a328d2c1de83718534ea722ef9dadcbdca164 SHA512 40fb28fb6ac06b59fed9fec86816a444f53ea499bb9a7e7a072a5a932b45a29f830b9da9de0954b1f5cb21903c08ff5c997db2e32ee0bb1a300cd6c070cc8aa6 +AUX display-manager.initd 6145 BLAKE2B fb1debd71978b157c185d9a7065c7f630a0d64839652b3882e6f69823444694f4a7fb347a49dcff35c11a9df94b5e8dcc85eac8351ce9a9992c23a13e67eb669 SHA512 5ea8c89d29c03ebf814a5bd036387bf9d8e65962f402b6ea2ce26e3c99f2972fc971b3b6e5e6971a3f1dc559a6d0ddf8b7f5b7f2170bafacfa79653cf3c5445d +AUX startDM 786 BLAKE2B c5026e862508e598a0b3e8940a5dffd697fecc109eef343ea0f91d72b1b6df927dd273a1e69cddbae7324b707c9cc7b2f2699c44d106100f2b32db28c331f331 SHA512 a35ef86109624f5adb4275906f8466ef8e7a62af93bf2038b5f44e713b446264f1ecb00ff8bb7bb498a89bdbf3b96e50ebf5a7a39471c3c4395506c92f907dcd +AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c +EBUILD display-manager-init-1.0.ebuild 1097 BLAKE2B e053ed6307efcfb8bfd28e031d675cfcf0283fe228eb61429c546568d902687d1ffc651195b15468c7dc56adbc0fff33c7dde0ed92203cda243ec5422fe62849 SHA512 97bd4912687bf6854c1837688ee90ada622857ea7c5fa9913d79d48b1523bd486becdf3a9b7810bd3ef11d9f43ed152a70fb159544b6e9cae11bb09d088334b8 +MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r10.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r10.ebuild new file mode 100644 index 00000000..b93a08c1 --- /dev/null +++ b/gui-libs/display-manager-init/display-manager-init-1.0-r10.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="RC init files for starting display and login managers" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="0" + +S="${FILESDIR}" + +RDEPEND=" + sys-apps/gentoo-functions + !<=sys-apps/sysvinit-2.98 + !<=x11-apps/xinit-1.4.1 + !<=x11-base/xorg-server-1.20.10-r10 +" + +src_install() { + newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup + newinitd "${FILESDIR}"/display-manager.initd display-manager + newinitd "${FILESDIR}"/xdm.initd xdm + newconfd "${FILESDIR}"/display-manager.confd display-manager + exeinto /usr/bin + doexe "${FILESDIR}"/startDM + # backwards compatibility + dosym "${ESYSROOT}"/usr/bin/startDM /etc/X11/startDM.sh +} + +pkg_postinst() { + # Redcore Linux tweak : automatically migrate all users + "${ROOT}"/sbin/rc-update del xdm default > /dev/null 2>&1 + "${ROOT}"/sbin/rc-update add display-manager default > /dev/null 2>&1 +} diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/gui-libs/display-manager-init/files/display-manager-setup.initd index 8f2ed27e..05feeee8 100644 --- a/x11-base/xorg-server/files/xdm-setup.initd-1 +++ b/gui-libs/display-manager-init/files/display-manager-setup.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { @@ -7,7 +7,7 @@ depend() { } start() { - if get_bootparam "nox" ; then - touch /etc/.noxdm + if get_bootparam "nogui" ; then + touch /run/.nogui fi } diff --git a/gui-libs/display-manager-init/files/display-manager.confd b/gui-libs/display-manager-init/files/display-manager.confd new file mode 100644 index 00000000..b86e1c4a --- /dev/null +++ b/gui-libs/display-manager-init/files/display-manager.confd @@ -0,0 +1,13 @@ +# We always try and start the DM on a static VT. The various DMs normally +# default to using VT7. If you wish to use the display-manager init +# script, then you should ensure that the VT checked is the same VT your +# DM wants to use. +# We do this check to ensure that you haven't accidentally configured +# something to run on the VT in your /etc/inittab file so that +# you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? +# [ xdm | greetd | gdm | sddm | gpe | lightdm | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +DISPLAYMANAGER="sddm" diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/gui-libs/display-manager-init/files/display-manager.initd index 5e234e40..e650df96 100644 --- a/x11-base/xorg-server/files/xdm.initd-11 +++ b/gui-libs/display-manager-init/files/display-manager.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 # This is here to serve as a note to myself, and future developers. @@ -12,22 +12,22 @@ # # Resolution: add the following line to /etc/inittab # -# x:a:once:/etc/X11/startDM.sh +# x:a:once:/usr/bin/startDM # -# and have /etc/X11/startDM.sh start the DM in daemon mode if +# and have /usr/bin/startDM start the DM in daemon mode if # a lock is present (with the info of what DM should be started), # else just fall through. # # How this basically works, is the "a" runlevel is a additional # runlevel that you can use to fork processes with init, but the -# runlevel never gets changed to this runlevel. Along with the "a" -# runlevel, the "once" key word means that startDM.sh will only be +# runlevel never gets changed to this runlevel. Along with the "a" +# runlevel, the "once" key word means that startDM will only be # run when we specify it to run, thus eliminating respawning -# startDM.sh when "xdm" is not added to the default runlevel, as was -# done previously. +# startDM when "display-manager" is not added to the default +# runlevel, as was done previously. # # This script then just calls "telinit a", and init will run -# /etc/X11/startDM.sh after the current runlevel completes (this +# /usr/bin/startDM after the current runlevel completes (this # script should only be added to the actual runlevel the user is # using). # @@ -36,7 +36,7 @@ # 04 March 2002 depend() { - need localmount xdm-setup + need localmount display-manager-setup # this should start as early as possible # we can't do 'before *' as that breaks it @@ -51,22 +51,21 @@ depend() { after quota keymaps before alsasound - # Start before X - use consolekit dbus elogind xfs + # Start before GUI + use dbus xfs } setup_dm() { local MY_XDM - - MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') - # Load our root path from profile.env - # Needed for kdm - PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") + MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') NAME= case "${MY_XDM}" in kdm|kde) + # Load our root path from profile.env + # Needed for kdm + PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") EXE=/usr/bin/kdm PIDFILE=/run/kdm.pid ;; @@ -87,6 +86,11 @@ setup_dm() { fi [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary ;; + greetd) + EXE=/usr/bin/greetd + PIDFILE=/run/greetd.pid + START_STOP_ARGS="-m --background" + ;; wdm) EXE=/usr/bin/wdm PIDFILE= @@ -115,7 +119,7 @@ setup_dm() { EXE="$(command -v ${MY_XDM} 2>/dev/null)" PIDFILE="/run/${MY_XDM}.pid" - # warn user that he is doing sick things if the exe was not found + # warn user that they are doing sick things if the exe was not found if [ -z "${EXE}" ]; then echo "ERROR: Your XDM value is invalid." echo " No ${MY_XDM} executable could be found on your system." @@ -149,9 +153,9 @@ start() { local EXE NAME PIDFILE AUTOCLEAN_CGROUP setup_dm - if [ -f /etc/.noxdm ]; then - einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." - rm /etc/.noxdm + if [ -f /run/.nogui ]; then + einfo "Skipping ${EXE##*/}, /run/.nogui found or 'nogui' bootparam passed." + rm /run/.nogui return 0 fi @@ -177,7 +181,7 @@ start() { fi fi - /etc/X11/startDM.sh + /usr/bin/startDM eend 0 } @@ -209,8 +213,8 @@ stop() { if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ - ${mypidfile:+--pidfile} ${mypidfile} \ - ${myname:+--name} ${myname} + "${mypidfile:+--pidfile}" "${mypidfile}" \ + "${myname:+--name}" "${myname}" retval=${?} fi diff --git a/gui-libs/display-manager-init/files/startDM b/gui-libs/display-manager-init/files/startDM new file mode 100644 index 00000000..976d1dd2 --- /dev/null +++ b/gui-libs/display-manager-init/files/startDM @@ -0,0 +1,29 @@ +#!/bin/sh +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 + +# We need to source /etc/profile.env for stuff like $LANG to work +# bug #10190. +. /etc/profile.env + +# need eerror +. /lib/gentoo/functions.sh + +# Bail out early if on a non-OpenRC system: +if [ ! -d /run/openrc ]; then + eerror "$0 should only be used on OpenRC systems" +fi + +. /lib/rc/sh/functions.sh + +export RC_SVCNAME=display-manager +EXEC="$(get_options service)" +NAME="$(get_options name)" +PIDFILE="$(get_options pidfile)" +START_STOP_ARGS="$(get_options start_stop_args)" + +start-stop-daemon --start --exec "${EXEC}" \ +"${NAME:+--name}" "${NAME}" "${PIDFILE:+--pidfile}" "${PIDFILE}" ${START_STOP_ARGS} || \ +eerror "ERROR: could not start the Display Manager" + +# vim:ts=4 diff --git a/gui-libs/display-manager-init/files/xdm.initd b/gui-libs/display-manager-init/files/xdm.initd new file mode 100644 index 00000000..2fce43b0 --- /dev/null +++ b/gui-libs/display-manager-init/files/xdm.initd @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 + +depend() { + need display-manager +} + +start() { + return +} + +# vim: set ts=4 : diff --git a/gui-libs/display-manager-init/metadata.xml b/gui-libs/display-manager-init/metadata.xml new file mode 100644 index 00000000..7a7bbf81 --- /dev/null +++ b/gui-libs/display-manager-init/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> +</pkgmetadata> diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4 deleted file mode 100644 index b4902f14..00000000 --- a/x11-base/xorg-server/files/xdm.confd-4 +++ /dev/null @@ -1,10 +0,0 @@ -# We always try and start X on a static VT. The various DMs normally default -# to using VT7. If you wish to use the xdm init script, then you should ensure -# that the VT checked is the same VT your DM wants to use. We do this check to -# ensure that you haven't accidentally configured something to run on the VT -# in your /etc/inittab file so that you don't get a dead keyboard. -CHECKVT=7 - -# What display manager do you use ? [ xdm | gdm | sddm | gpe | lightdm | entrance ] -# NOTE: If this is set in /etc/rc.conf, that setting will override this one. -DISPLAYMANAGER="sddm" diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r10.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r100.ebuild index 90204761..2ee6fdb1 100644 --- a/x11-base/xorg-server/xorg-server-1.20.10-r10.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.10-r100.ebuild @@ -100,6 +100,7 @@ DEPEND="${CDEPEND} )" RDEPEND="${CDEPEND} + gui-libs/display-manager-init selinux? ( sec-policy/selinux-xserver ) " @@ -199,10 +200,6 @@ src_install() { dodoc "${S}"/hw/xfree86/xorg.conf.example fi - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-11 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - # install the @x11-module-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/xorg-sets.conf xorg.conf |