From 1077a9ac2f9b32c6f28f9e6e6188b0f4c8dd926d Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 28 Aug 2015 18:02:24 -0500 Subject: openrc-desktop-20150828-1: updating version --- pcr/openrc-desktop/PKGBUILD | 297 +++++++++++++++---------------- pcr/openrc-desktop/acpid-2.0.16-conf.d | 6 - pcr/openrc-desktop/acpid-2.0.16-init.d | 21 --- pcr/openrc-desktop/alsasound.confd-r4 | 15 -- pcr/openrc-desktop/alsasound.initd-r6 | 88 --------- pcr/openrc-desktop/avahi-daemon | 29 --- pcr/openrc-desktop/avahi-daemon.initd | 29 +++ pcr/openrc-desktop/avahi-dnsconfd | 28 --- pcr/openrc-desktop/avahi-dnsconfd.initd | 28 +++ pcr/openrc-desktop/bluetooth-init.d-r3 | 21 --- pcr/openrc-desktop/consolekit-0.2.rc | 26 --- pcr/openrc-desktop/gpm.conf.d | 23 --- pcr/openrc-desktop/gpm.rc6-2 | 29 --- pcr/openrc-desktop/rfcomm-conf.d | 5 - pcr/openrc-desktop/rfcomm-init.d-r2 | 35 ---- pcr/openrc-desktop/startDM.sh | 31 ---- pcr/openrc-desktop/wpa_cli.sh | 47 ----- pcr/openrc-desktop/wpa_supplicant-conf.d | 6 - pcr/openrc-desktop/wpa_supplicant-init.d | 70 -------- pcr/openrc-desktop/xdm-setup.initd-1 | 14 -- pcr/openrc-desktop/xdm.confd-4 | 10 -- pcr/openrc-desktop/xdm.initd-11 | 231 ------------------------ 22 files changed, 196 insertions(+), 893 deletions(-) delete mode 100644 pcr/openrc-desktop/acpid-2.0.16-conf.d delete mode 100644 pcr/openrc-desktop/acpid-2.0.16-init.d delete mode 100644 pcr/openrc-desktop/alsasound.confd-r4 delete mode 100644 pcr/openrc-desktop/alsasound.initd-r6 delete mode 100644 pcr/openrc-desktop/avahi-daemon create mode 100644 pcr/openrc-desktop/avahi-daemon.initd delete mode 100644 pcr/openrc-desktop/avahi-dnsconfd create mode 100644 pcr/openrc-desktop/avahi-dnsconfd.initd delete mode 100644 pcr/openrc-desktop/bluetooth-init.d-r3 delete mode 100644 pcr/openrc-desktop/consolekit-0.2.rc delete mode 100644 pcr/openrc-desktop/gpm.conf.d delete mode 100644 pcr/openrc-desktop/gpm.rc6-2 delete mode 100644 pcr/openrc-desktop/rfcomm-conf.d delete mode 100644 pcr/openrc-desktop/rfcomm-init.d-r2 delete mode 100644 pcr/openrc-desktop/startDM.sh delete mode 100644 pcr/openrc-desktop/wpa_cli.sh delete mode 100644 pcr/openrc-desktop/wpa_supplicant-conf.d delete mode 100644 pcr/openrc-desktop/wpa_supplicant-init.d delete mode 100644 pcr/openrc-desktop/xdm-setup.initd-1 delete mode 100644 pcr/openrc-desktop/xdm.confd-4 delete mode 100644 pcr/openrc-desktop/xdm.initd-11 (limited to 'pcr/openrc-desktop') diff --git a/pcr/openrc-desktop/PKGBUILD b/pcr/openrc-desktop/PKGBUILD index f7189414e..672f9300e 100644 --- a/pcr/openrc-desktop/PKGBUILD +++ b/pcr/openrc-desktop/PKGBUILD @@ -1,202 +1,183 @@ -# Maintainer : freaj -# Maintainer (Manjaro): artoo - -# file vars for easy update -_Cacpi=acpid-2.0.16-conf.d -_Iacpi=acpid-2.0.16-init.d -_Calsa=alsasound.confd-r4 -_Ialsa=alsasound.initd-r6 -_Ick=consolekit-0.2.rc -_Cxdm=xdm.confd-4 -_Ixdm1=xdm.initd-11 -_Ixdm2=xdm-setup.initd-1 -_Sxdm=startDM.sh -_Cgpm=gpm.conf.d -_Igpm=gpm.rc6-2 -_Cblue=rfcomm-conf.d -_Iblue1=rfcomm-init.d-r2 -_Iblue2=bluetooth-init.d-r3 -_Cwpa=wpa_supplicant-conf.d -_Iwpa=wpa_supplicant-init.d -_Swpa=wpa_cli.sh +# Maintainer (Arch): artoo +# Maintainer: Omar Vega Ramos _gentoo_uri="http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86" pkgbase=openrc-desktop pkgname=('acpid-openrc' - 'alsa-utils-openrc' - 'avahi-openrc' - 'consolekit-openrc' - 'displaymanager-openrc' - 'gpm-openrc' - 'bluez-openrc' - 'wpa_supplicant-openrc') -pkgver=20150325 + 'alsa-utils-openrc' + 'avahi-openrc' + 'consolekit-openrc' + 'displaymanager-openrc' + 'gpm-openrc' + 'bluez-openrc' + 'wpa_supplicant-openrc') +pkgver=20150828 pkgrel=1 pkgdesc="OpenRC init scripts" arch=('any') url="https://github.com/manjaro/packages-openrc" license=('GPL2') -groups=('openrc' 'openrc-desktop') +groups=('openrc-desktop') conflicts=('openrc' - 'openrc-git' - 'openrc-arch-services-git' - 'initscripts' - 'systemd-sysvcompat') -source=("${_gentoo_uri}/sys-power/acpid/files/${_Cacpi}" - "${_gentoo_uri}/sys-power/acpid/files/${_Iacpi}" - "${_gentoo_uri}/media-sound/alsa-utils/files/${_Calsa}" - "${_gentoo_uri}/media-sound/alsa-utils/files/${_Ialsa}" - "${_gentoo_uri}/sys-auth/consolekit/files/${_Ick}" - "${_gentoo_uri}/x11-base/xorg-server/files/${_Cxdm}" - "${_gentoo_uri}/x11-base/xorg-server/files/${_Ixdm1}" - "${_gentoo_uri}/x11-base/xorg-server/files/${_Ixdm2}" - "${_gentoo_uri}/x11-apps/xinit/files/${_Sxdm}" - "${_gentoo_uri}/sys-libs/gpm/files/${_Cgpm}" - "${_gentoo_uri}/sys-libs/gpm/files/${_Igpm}" - 'avahi-daemon' - 'avahi-dnsconfd' - "${_gentoo_uri}/net-wireless/bluez/files/${_Cblue}" - "${_gentoo_uri}/net-wireless/bluez/files/${_Iblue1}" - "${_gentoo_uri}/net-wireless/bluez/files/${_Iblue2}" - "${_gentoo_uri}/net-wireless/wpa_supplicant/files/${_Cwpa}" - "${_gentoo_uri}/net-wireless/wpa_supplicant/files/${_Iwpa}" - "${_gentoo_uri}/net-wireless/wpa_supplicant/files/${_Swpa}") + 'openrc-git' + 'openrc-arch-services-git' + 'initscripts' + 'systemd-sysvcompat') +source=("acpid.confd::${_gentoo_uri}/sys-power/acpid/files/acpid-2.0.16-conf.d" + "acpid.initd::${_gentoo_uri}/sys-power/acpid/files/acpid-2.0.16-init.d" + "alsasound.confd::${_gentoo_uri}/media-sound/alsa-utils/files/alsasound.confd-r4" + "alsasound.initd::${_gentoo_uri}/media-sound/alsa-utils/files/alsasound.initd-r6" + "consolekit.initd::${_gentoo_uri}/sys-auth/consolekit/files/consolekit-0.2.rc" + "xdm.confd::${_gentoo_uri}/x11-base/xorg-server/files/xdm.confd-4" + "xdm.initd::${_gentoo_uri}/x11-base/xorg-server/files/xdm.initd-11" + "xdm-setup.initd::${_gentoo_uri}/x11-base/xorg-server/files/xdm-setup.initd-1" + "${_gentoo_uri}/x11-apps/xinit/files/startDM.sh" + "gpm.confd::${_gentoo_uri}/sys-libs/gpm/files/gpm.conf.d" + "gpm.initd::${_gentoo_uri}/sys-libs/gpm/files/gpm.rc6-2" + "rfcomm.confd::${_gentoo_uri}/net-wireless/bluez/files/rfcomm-conf.d" + "rfcomm.initd::${_gentoo_uri}/net-wireless/bluez/files/rfcomm-init.d-r2" + "bluetooth.initd::${_gentoo_uri}/net-wireless/bluez/files/bluetooth-init.d-r3" + "wpa_supplicant.confd::${_gentoo_uri}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d" + "wpa_supplicant.initd::${_gentoo_uri}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d" + "${_gentoo_uri}/net-wireless/wpa_supplicant/files/wpa_cli.sh" + 'avahi-daemon.initd' + 'avahi-dnsconfd.initd') +sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' + '980468e6bf96c7677898330cadbcff165b4d15f1197cd544548bd0f8c376983d' + 'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' + '5fdcb0212bf8a4be74f410534534fdda6dd8d57df0d2a6c4a158464f705fed18' + 'da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49' + '9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8' + '86a17c9ba172481318d5fd51c3aadfdcad9e5d52ed7478379723ce1784061930' + '942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406' + 'e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499' + '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' + 'e692e7b97efdd79f6e92fbdaed60f7a71bfd23a82c5561b160b88a7aa50c8461' + '672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08' + 'e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09' + 'de7f4a890cf994e1c283251ac5ac6b0aedb29104d708e5e7a77702ac2055dec7' + '61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90' + '62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0' + 'a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179' + '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646' + 'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15') pkgver() { - date +%Y%m%d + date +%Y%m%d } -_shebang='s|#!/sbin/runscript|#!/usr/bin/openrc-run|' -_runpath='s|/var/run|/run|g' -_binpath='s|/usr/sbin|/usr/bin|g' +_inst_initd(){ + install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 -package_acpid-openrc() { - pkgdesc="OpenRC acpid init script" - depends=('openrc-core' 'acpid') - backup=('etc/conf.d/acpid') - install=acpid.install + sed -e 's|#!/sbin/runscript|#!/usr/bin/openrc-run|' \ + -e 's|/var/run|/run|g' \ + -e 's|/usr/sbin|/usr/bin|g' \ + -i ${pkgdir}/etc/init.d/$1 +} - install -Dm755 "${srcdir}/${_Cacpi}" "${pkgdir}/etc/conf.d/acpid" - install -Dm755 "${srcdir}/${_Iacpi}" "${pkgdir}/etc/init.d/acpid" +_inst_confd(){ + install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 +} + +package_acpid-openrc() { + pkgdesc="OpenRC acpid init script" + depends=('openrc-core' 'acpid') + backup=('etc/conf.d/acpid') + install=acpid.install - sed -e "${_shebang}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/acpid" + _inst_confd 'acpid' + _inst_initd 'acpid' } package_alsa-utils-openrc() { - pkgdesc="OpenRC alsa-utils init script" - depends=('openrc-core' 'alsa-utils') - backup=('etc/conf.d/alsasound') - install=alsa-utils.install + pkgdesc="OpenRC alsa-utils init script" + depends=('openrc-core' 'alsa-utils') + backup=('etc/conf.d/alsasound') + install=alsa-utils.install - install -Dm755 "${srcdir}/${_Calsa}" "${pkgdir}/etc/conf.d/alsasound" - install -Dm755 "${srcdir}/${_Ialsa}" "${pkgdir}/etc/init.d/alsasound" - - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/alsasound" + _inst_confd 'alsasound' + _inst_initd 'alsasound' } package_avahi-openrc() { - pkgdesc="OpenRC avahi init script" - depends=('avahi' 'dbus-openrc') - install=avahi.install + pkgdesc="OpenRC avahi init script" + depends=('avahi' 'dbus-openrc') + install=avahi.install - install -Dm755 "${srcdir}/avahi-daemon" "${pkgdir}/etc/init.d/avahi-daemon" - install -Dm755 "${srcdir}/avahi-dnsconfd" "${pkgdir}/etc/init.d/avahi-dnsconfd" + _inst_initd 'avahi-daemon' + _inst_initd 'avahi-dnsconfd' } package_consolekit-openrc() { - pkgdesc="OpenRC consolekit init script" - depends=('consolekit' 'dbus-openrc') - install=consolekit.install - - install -Dm755 "$srcdir/${_Ick}" "$pkgdir/etc/init.d/consolekit" + pkgdesc="OpenRC consolekit init script" + depends=('consolekit' 'dbus-openrc') + install=consolekit.install - sed -e "${_shebang}" -e "${_runpath}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/consolekit" + _inst_initd 'consolekit' } package_displaymanager-openrc() { - pkgdesc="OpenRC dm init script" - depends=('openrc-core' 'xorg-server' 'xorg-xinit') - optdepends=('consolekit-openrc: consolekit initscript' - 'dbus-openrc: dbus initscript') - backup=('etc/conf.d/xdm') - install=displaymanager.install - - install -Dm755 "${srcdir}/${_Cxdm}" "${pkgdir}/etc/conf.d/xdm" - install -Dm755 "${srcdir}/${_Ixdm1}" "${pkgdir}/etc/init.d/xdm" - install -Dm755 "${srcdir}/${_Ixdm2}" "${pkgdir}/etc/init.d/xdm-setup" - install -Dm755 "${srcdir}/${_Sxdm}" "${pkgdir}/etc/X11/startDM.sh" - - local _p1='s|/etc/profile.env|/etc/profile|g' \ - _p2='s|{ROOTPATH}|{PATH}|g' - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/xdm" - sed -e "${_shebang}" -i "${pkgdir}/etc/init.d/xdm-setup" + pkgdesc="OpenRC dm init script" + depends=('openrc-core' 'xorg-server' 'xorg-xinit') + optdepends=('consolekit-openrc: consolekit initscript' + 'dbus-openrc: dbus initscript') + backup=('etc/conf.d/xdm') + install=displaymanager.install + + _inst_confd 'xdm' + _inst_initd 'xdm' + _inst_initd 'xdm-setup' + + install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh" + + sed -e 's|/etc/profile.env|/etc/profile|g' \ + -e 's|{ROOTPATH}|{PATH}|g' \ + -i "${pkgdir}/etc/init.d/xdm" } package_gpm-openrc() { - pkgdesc="OpenRC gpm init script" - depends=('openrc-core' 'gpm') - backup=('etc/conf.d/gpm') - install=gpm.install - - install -Dm755 "${srcdir}/${_Cgpm}" "${pkgdir}/etc/conf.d/gpm" - install -Dm755 "${srcdir}/${_Igpm}" "${pkgdir}/etc/init.d/gpm" + pkgdesc="OpenRC gpm init script" + depends=('openrc-core' 'gpm') + backup=('etc/conf.d/gpm') + install=gpm.install - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/gpm" + _inst_confd 'gpm' + _inst_initd 'gpm' } package_bluez-openrc() { - pkgdesc="OpenRC bluez init script" - groups=('openrc' 'openrc-mobile') - depends=('bluez' 'dbus-openrc') - backup=('etc/conf.d/rfcomm') - install=bluez.install - - install -Dm755 "${srcdir}/${_Cblue}" "${pkgdir}/etc/conf.d/rfcomm" - install -Dm755 "${srcdir}/${_Iblue1}" "${pkgdir}/etc/init.d/rfcomm" - install -Dm755 "${srcdir}/${_Iblue2}" "${pkgdir}/etc/init.d/bluetooth" - - local _p1='s|/usr/sbin|/usr/lib/bluetooth|g' _p2='s/libexec/lib/' - sed -e "${_shebang}" -e "${_p1}" -e "${_p2}" -i "${pkgdir}/etc/init.d/bluetooth" - sed -e "${_shebang}" -e "${_binpath}" -i "${pkgdir}/etc/init.d/rfcomm" + pkgdesc="OpenRC bluez init script" + groups=('openrc-mobile') + depends=('bluez' 'dbus-openrc') + backup=('etc/conf.d/rfcomm') + install=bluez.install + + _inst_confd 'rfcomm' + _inst_initd 'rfcomm' + _inst_initd 'bluetooth' + + sed -e 's|/usr/sbin|/usr/lib/bluetooth|g' \ + -e 's/libexec/lib/' \ + -i "${pkgdir}/etc/init.d/bluetooth" } package_wpa_supplicant-openrc() { - pkgdesc="OpenRC wpa_supplicant init script" - groups=('openrc' 'openrc-mobile') - depends=('openrc-core' 'wpa_supplicant') - backup=('etc/conf.d/wpa_supplicant') - install=wpa_supplicant.install - - install -Dm755 "${srcdir}/${_Cwpa}" "${pkgdir}/etc/conf.d/wpa_supplicant" - install -Dm755 "${srcdir}/${_Iwpa}" "${pkgdir}/etc/init.d/wpa_supplicant" - install -Dm755 "${srcdir}/${_Swpa}" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - - sed -e "${_shebang}" -e "${_binpath}" -e "${_runpath}" -i "${pkgdir}/etc/init.d/wpa_supplicant" - if [[ -f /etc/os-release ]];then - . /etc/os-release - sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - else - sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - fi + pkgdesc="OpenRC wpa_supplicant init script" + groups=('openrc-mobile') + depends=('openrc-core' 'wpa_supplicant') + backup=('etc/conf.d/wpa_supplicant') + install=wpa_supplicant.install + + _inst_confd 'wpa_supplicant' + _inst_initd 'wpa_supplicant' + + install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + + if [[ -f /etc/os-release ]];then + . /etc/os-release + sed -e "s|gentoo-release|${ID}-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + else + sed -e 's|gentoo-release|arch-release|' -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" + fi } - -sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' - '980468e6bf96c7677898330cadbcff165b4d15f1197cd544548bd0f8c376983d' - 'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' - '5fdcb0212bf8a4be74f410534534fdda6dd8d57df0d2a6c4a158464f705fed18' - 'da849bae527a7a5c257301a99ac3fb5ec2ded48103ec114552ca7d2a24b12e49' - '9d26b72bb28611a60a6b9f942b8d8cfe47b59f926be89af9709b5912668344d8' - '86a17c9ba172481318d5fd51c3aadfdcad9e5d52ed7478379723ce1784061930' - '942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406' - 'e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499' - '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' - 'e692e7b97efdd79f6e92fbdaed60f7a71bfd23a82c5561b160b88a7aa50c8461' - '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646' - 'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15' - '672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08' - 'e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09' - 'de7f4a890cf994e1c283251ac5ac6b0aedb29104d708e5e7a77702ac2055dec7' - '61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90' - '62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0' - 'a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179') diff --git a/pcr/openrc-desktop/acpid-2.0.16-conf.d b/pcr/openrc-desktop/acpid-2.0.16-conf.d deleted file mode 100644 index 9aadb4cd8..000000000 --- a/pcr/openrc-desktop/acpid-2.0.16-conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/conf.d/acpid: config file for /etc/init.d/acpid - -# Options to pass to the acpid daemon. -# See the acpid(8) man page for more info. - -ACPID_ARGS="" diff --git a/pcr/openrc-desktop/acpid-2.0.16-init.d b/pcr/openrc-desktop/acpid-2.0.16-init.d deleted file mode 100644 index 412a265fc..000000000 --- a/pcr/openrc-desktop/acpid-2.0.16-init.d +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.16-init.d,v 1.1 2012/05/19 09:53:59 ssuominen Exp $ - -extra_started_commands="reload" -command="/usr/sbin/acpid" -command_args="${ACPID_ARGS}" -start_stop_daemon_args="--quiet" -description="Daemon for Advanced Configuration and Power Interface" - -depend() { - need localmount - use logger -} - -reload() { - ebegin "Reloading acpid configuration" - start-stop-daemon --exec $command --signal HUP - eend $? -} diff --git a/pcr/openrc-desktop/alsasound.confd-r4 b/pcr/openrc-desktop/alsasound.confd-r4 deleted file mode 100644 index 6fec8f593..000000000 --- a/pcr/openrc-desktop/alsasound.confd-r4 +++ /dev/null @@ -1,15 +0,0 @@ -# RESTORE_ON_START: -# Do you want to restore your mixer settings? If not, your cards will be -# muted. -# no - Do not restore state -# yes - Restore state - -RESTORE_ON_START="yes" - -# SAVE_ON_STOP: -# Do you want to save changes made to your mixer volumes when alsasound -# stops? -# no - Do not save state -# yes - Save state - -SAVE_ON_STOP="yes" diff --git a/pcr/openrc-desktop/alsasound.initd-r6 b/pcr/openrc-desktop/alsasound.initd-r6 deleted file mode 100644 index 2eddfd308..000000000 --- a/pcr/openrc-desktop/alsasound.initd-r6 +++ /dev/null @@ -1,88 +0,0 @@ -#!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r6,v 1.1 2014/06/23 21:34:42 ssuominen Exp $ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -alsastatedir=/var/lib/alsa -alsascrdir=/etc/alsa.d -alsahomedir=/var/run/alsasound - -extra_commands="save restore" - -depend() { - need localmount - after bootmisc modules isapnp coldplug hotplug -} - -restore() { - ebegin "Restoring Mixer Levels" - - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 - - if [ ! -r "${alsastatedir}/asound.state" ] ; then - ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" - eend 0 - return 0 - fi - - local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" - local CARDNUM - for cardnum in ${cards}; do - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \ - || ewarn "Errors while restoring defaults, ignoring" - done - - for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do - [ -e "${ossfile}" ] || continue - # We use cat because I'm not sure if cp works properly on /proc - local procfile=${ossfile##${alsastatedir}/oss} - procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" - if [ -e /proc/asound/"${procfile}"/oss ] ; then - cat "${ossfile}" > /proc/asound/"${procfile}"/oss - fi - done - - eend 0 -} - -save() { - ebegin "Storing ALSA Mixer Levels" - - checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 - - mkdir -p "${alsastatedir}" - if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then - eerror "Error saving levels." - eend 1 - return 1 - fi - - for ossfile in /proc/asound/card*/pcm*/oss; do - [ -e "${ossfile}" ] || continue - local device=${ossfile##/proc/asound/} ; device=${device%%/oss} - device="$(echo "${device}" | sed -e 's,/,_,g')" - mkdir -p "${alsastatedir}/oss/" - cp "${ossfile}" "${alsastatedir}/oss/${device}" - done - - eend 0 -} - -start() { - if [ "${RESTORE_ON_START}" = "yes" ]; then - restore - fi - - return 0 -} - -stop() { - if [ "${SAVE_ON_STOP}" = "yes" ]; then - save - fi - return 0 -} diff --git a/pcr/openrc-desktop/avahi-daemon b/pcr/openrc-desktop/avahi-daemon deleted file mode 100644 index 3db552903..000000000 --- a/pcr/openrc-desktop/avahi-daemon +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - before netmount nfsmount - use net - need dbus -} - -start() { - ebegin "Starting avahi-daemon" - /usr/bin/avahi-daemon -D - eend $? -} - -stop() { - ebegin "Stopping avahi-daemon" - /usr/bin/avahi-daemon -k - eend $? -} - -reload() { - ebegin "Reloading avahi-daemon" - /usr/bin/avahi-daemon -r - eend $? -} diff --git a/pcr/openrc-desktop/avahi-daemon.initd b/pcr/openrc-desktop/avahi-daemon.initd new file mode 100644 index 000000000..3db552903 --- /dev/null +++ b/pcr/openrc-desktop/avahi-daemon.initd @@ -0,0 +1,29 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +depend() { + before netmount nfsmount + use net + need dbus +} + +start() { + ebegin "Starting avahi-daemon" + /usr/bin/avahi-daemon -D + eend $? +} + +stop() { + ebegin "Stopping avahi-daemon" + /usr/bin/avahi-daemon -k + eend $? +} + +reload() { + ebegin "Reloading avahi-daemon" + /usr/bin/avahi-daemon -r + eend $? +} diff --git a/pcr/openrc-desktop/avahi-dnsconfd b/pcr/openrc-desktop/avahi-dnsconfd deleted file mode 100644 index 1389a2889..000000000 --- a/pcr/openrc-desktop/avahi-dnsconfd +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - need avahi-daemon - use net -} - -start() { - ebegin "Starting avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -D - eend $? -} - -stop() { - ebegin "Stopping avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -k - eend $? -} - -reload() { - ebegin "Reloading avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -r - eend $? -} diff --git a/pcr/openrc-desktop/avahi-dnsconfd.initd b/pcr/openrc-desktop/avahi-dnsconfd.initd new file mode 100644 index 000000000..1389a2889 --- /dev/null +++ b/pcr/openrc-desktop/avahi-dnsconfd.initd @@ -0,0 +1,28 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +depend() { + need avahi-daemon + use net +} + +start() { + ebegin "Starting avahi-dnsconfd" + /usr/bin/avahi-dnsconfd -D + eend $? +} + +stop() { + ebegin "Stopping avahi-dnsconfd" + /usr/bin/avahi-dnsconfd -k + eend $? +} + +reload() { + ebegin "Reloading avahi-dnsconfd" + /usr/bin/avahi-dnsconfd -r + eend $? +} diff --git a/pcr/openrc-desktop/bluetooth-init.d-r3 b/pcr/openrc-desktop/bluetooth-init.d-r3 deleted file mode 100644 index f97fdb2c7..000000000 --- a/pcr/openrc-desktop/bluetooth-init.d-r3 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r3,v 1.2 2014/01/09 13:24:42 joker Exp $ - -depend() { - after coldplug - need dbus localmount hostname -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --background --exec /usr/libexec/bluetooth/bluetoothd - eend $? -} - -stop() { - ebegin "Shutting down ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /usr/libexec/bluetooth/bluetoothd - eend $? -} diff --git a/pcr/openrc-desktop/consolekit-0.2.rc b/pcr/openrc-desktop/consolekit-0.2.rc deleted file mode 100644 index b20226767..000000000 --- a/pcr/openrc-desktop/consolekit-0.2.rc +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/files/consolekit-0.2.rc,v 1.1 2011/10/20 19:14:47 axs Exp $ - -depend() { - need dbus - use logger -} - -start() { - ebegin "Starting ConsoleKit daemon" - - checkpath -q -d -m 0755 /var/run/ConsoleKit - - start-stop-daemon --start -q \ - --pidfile /var/run/ConsoleKit/pid \ - --exec /usr/sbin/console-kit-daemon -- - eend $? -} - -stop() { - ebegin "Stopping ConsoleKit daemon" - start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid - eend $? -} diff --git a/pcr/openrc-desktop/gpm.conf.d b/pcr/openrc-desktop/gpm.conf.d deleted file mode 100644 index f21c25755..000000000 --- a/pcr/openrc-desktop/gpm.conf.d +++ /dev/null @@ -1,23 +0,0 @@ -# /etc/init.d/gpm - -# Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry - -MOUSE=ps2 -#MOUSE=imps2 -#MOUSEDEV=/dev/psaux -MOUSEDEV=/dev/input/mice - -# Extra settings - -#RESPONSIVENESS= -#REPEAT_TYPE=raw - -# Please uncomment this line if you want gpm to understand charsets used -# in URLs and names with ~ or : in them, etc. This is a good idea to turn on! - -#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\"" - -# Various other options, see gpm(8) manpage for more. - -#APPEND="-g 1 -A60" -#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60" diff --git a/pcr/openrc-desktop/gpm.rc6-2 b/pcr/openrc-desktop/gpm.rc6-2 deleted file mode 100644 index 1e0aaf3e1..000000000 --- a/pcr/openrc-desktop/gpm.rc6-2 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6-2,v 1.2 2012/10/28 11:35:56 vapier Exp $ - -#NB: Config is in /etc/conf.d/gpm - -command=/usr/sbin/gpm -command_args=" - -m ${MOUSEDEV} - -t ${MOUSE} - ${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} - ${REPEAT_TYPE:+ -R${REPEAT_TYPE}} - ${APPEND} -" - -pidfile=/var/run/gpm.pid - -depend() { - need localmount - use hotplug logger -} - -start_pre() { - if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then - eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first" - return 1 - fi -} diff --git a/pcr/openrc-desktop/rfcomm-conf.d b/pcr/openrc-desktop/rfcomm-conf.d deleted file mode 100644 index d87acdb28..000000000 --- a/pcr/openrc-desktop/rfcomm-conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Bind rfcomm devices (allowed values are "true" and "false") -RFCOMM_ENABLE=true - -# Config file for rfcomm -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/pcr/openrc-desktop/rfcomm-init.d-r2 b/pcr/openrc-desktop/rfcomm-init.d-r2 deleted file mode 100644 index c56405559..000000000 --- a/pcr/openrc-desktop/rfcomm-init.d-r2 +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d-r2,v 1.1 2014/06/26 17:18:43 alonbl Exp $ - -depend() { - need bluetooth -} - -checkconfig() { - if [ -z "${ADDRESS}" ]; then - eerror "ADDRESS must be set" - return 1 - fi - - return 0 -} - -start() { - local DEVICE=${RC_SVCNAME#*.} - - checkconfig || return 1 - - ebegin "Starting ${RC_SVCNAME}" - rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL} - eend $? -} - -stop() { - local DEVICE=${RC_SVCNAME#*.} - - ebegin "Shutting down ${RC_SVCNAME}" - rfcomm release "${DEVICE}" - eend $? -} diff --git a/pcr/openrc-desktop/startDM.sh b/pcr/openrc-desktop/startDM.sh deleted file mode 100644 index ebb797040..000000000 --- a/pcr/openrc-desktop/startDM.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $ - -# We need to source /etc/profile for stuff like $LANG to work -# bug #10190. -. /etc/profile - -. /etc/init.d/functions.sh - -# baselayout-1 compat -if ! type get_options >/dev/null 2>/dev/null ; then - [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh -fi - -# Great new Gnome2 feature, AA -# We enable this by default -export GDK_USE_XFT=1 - -export SVCNAME=xdm -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/pcr/openrc-desktop/wpa_cli.sh b/pcr/openrc-desktop/wpa_cli.sh deleted file mode 100644 index 4fd0d2cda..000000000 --- a/pcr/openrc-desktop/wpa_cli.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# Copyright 1999-2011 Gentoo Foundation -# Written by Roy Marples -# Distributed under the terms of the GNU General Public License v2 -# Alternatively, this file may be distributed under the terms of the BSD License -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.3 2011/07/08 07:06:21 gurligebis Exp $ - -if [ -z "$1" -o -z "$2" ]; then - logger -t wpa_cli "Insufficient parameters" - exit 1 -fi - -INTERFACE="$1" -ACTION="$2" - -# Note, the below action must NOT mark the interface down via ifconfig, ip or -# similar. Addresses can be removed, changed and daemons can be stopped, but -# the interface must remain up for wpa_supplicant to work. - -if [ -f /etc/gentoo-release ]; then - EXEC="/etc/init.d/net.${INTERFACE} --quiet" -else - logger -t wpa_cli "I don't know what to do with this distro!" - exit 1 -fi - -case ${ACTION} in - CONNECTED) - EXEC="${EXEC} start" - ;; - DISCONNECTED) - # Deactivated, since stopping /etc/init.d/net.wlanX - # stops the network completly. - EXEC="false ${EXEC} stop" - ;; - *) - logger -t wpa_cli "Unknown action ${ACTION}" - exit 1 - ;; -esac - -# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't -# stopping the interface and a background process - like wpa_cli - is. -export IN_BACKGROUND=true - -logger -t wpa_cli "interface ${INTERFACE} ${ACTION}" -${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed" diff --git a/pcr/openrc-desktop/wpa_supplicant-conf.d b/pcr/openrc-desktop/wpa_supplicant-conf.d deleted file mode 100644 index 104b9dc5d..000000000 --- a/pcr/openrc-desktop/wpa_supplicant-conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# conf.d file for wpa_supplicant -# -# Please check man 8 wpa_supplicant for more information about the options -# wpa_supplicant accepts. -# -wpa_supplicant_args="" diff --git a/pcr/openrc-desktop/wpa_supplicant-init.d b/pcr/openrc-desktop/wpa_supplicant-init.d deleted file mode 100644 index 8429a3733..000000000 --- a/pcr/openrc-desktop/wpa_supplicant-init.d +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/runscript -# Copyright (c) 2009 Roy Marples -# All rights reserved. Released under the 2-clause BSD license. - -command=/usr/sbin/wpa_supplicant -: ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf} -wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if -command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if" -name="WPA Supplicant Daemon" - -depend() -{ - need localmount - use logger - after bootmisc modules - before dns dhcpcd net - keyword -shutdown -} - -find_wireless() -{ - local iface= - - case "$RC_UNAME" in - Linux) - for iface in /sys/class/net/*; do - if [ -e "$iface"/wireless -o \ - -e "$iface"/phy80211 ] - then - echo "${iface##*/}" - return 0 - fi - done - ;; - *) - for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do - if ifconfig "${iface##*/}" 2>/dev/null | \ - grep -q "[ ]*ssid " - then - echo "${iface##*/}" - return 0 - fi - done - ;; - esac - - return 1 -} - -append_wireless() -{ - local iface= i= - - iface=$(find_wireless) - if [ -n "$iface" ]; then - for i in $iface; do - command_args="$command_args -i$i" - done - else - eerror "Could not find a wireless interface" - fi -} - -start_pre() -{ - case " $command_args" in - *" -i"*) ;; - *) append_wireless;; - esac -} diff --git a/pcr/openrc-desktop/xdm-setup.initd-1 b/pcr/openrc-desktop/xdm-setup.initd-1 deleted file mode 100644 index 365664e66..000000000 --- a/pcr/openrc-desktop/xdm-setup.initd-1 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $ - -depend() { - need localmount -} - -start() { - if get_bootparam "nox" ; then - touch /etc/.noxdm - fi -} diff --git a/pcr/openrc-desktop/xdm.confd-4 b/pcr/openrc-desktop/xdm.confd-4 deleted file mode 100644 index c82fece01..000000000 --- a/pcr/openrc-desktop/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 | kdm | gpe | entrance ] -# NOTE: If this is set in /etc/rc.conf, that setting will override this one. -DISPLAYMANAGER="xdm" diff --git a/pcr/openrc-desktop/xdm.initd-11 b/pcr/openrc-desktop/xdm.initd-11 deleted file mode 100644 index 2f7b47cb2..000000000 --- a/pcr/openrc-desktop/xdm.initd-11 +++ /dev/null @@ -1,231 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-11,v 1.1 2014/04/14 16:19:25 chithanh Exp $ - -# This is here to serve as a note to myself, and future developers. -# -# Any Display manager (gdm,kdm,xdm) has the following problem: if -# it is started before any getty, and no vt is specified, it will -# usually run on vt2. When the getty on vt2 then starts, and the -# DM is already started, the getty will take control of the keyboard, -# leaving us with a "dead" keyboard. -# -# Resolution: add the following line to /etc/inittab -# -# x:a:once:/etc/X11/startDM.sh -# -# and have /etc/X11/startDM.sh 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 -# 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. -# -# This script then just calls "telinit a", and init will run -# /etc/X11/startDM.sh after the current runlevel completes (this -# script should only be added to the actual runlevel the user is -# using). -# -# Martin Schlemmer -# aka Azarah -# 04 March 2002 - -depend() { - need localmount xdm-setup - - # this should start as early as possible - # we can't do 'before *' as that breaks it - # (#139824) Start after ypbind and autofs for network authentication - # (#145219 #180163) Could use lirc mouse as input device - # (#70689 comment #92) Start after consolefont to avoid display corruption - # (#291269) Start after quota, since some dm need readable home - # (#390609) gdm-3 will fail when dbus is not running - # (#366753) starting keymaps after X causes problems - after bootmisc consolefont modules netmount - after readahead-list ypbind autofs openvpn gpm lircmd - after quota keymaps - before alsasound - - # Start before X - use consolekit 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}") - - NAME= - case "${MY_XDM}" in - kdm|kde) - EXE=/usr/bin/kdm - PIDFILE=/run/kdm.pid - ;; - entrance*) - EXE=/usr/sbin/entrance - PIDFILE=/run/entrance.pid - ;; - gdm|gnome) - # gdm-3 and above has different paths - if [ -f /usr/sbin/gdm ]; then - EXE=/usr/sbin/gdm - PIDFILE=/run/gdm/gdm.pid - START_STOP_ARGS="--background" - AUTOCLEAN_CGROUP="yes" - else - EXE=/usr/bin/gdm - PIDFILE=/run/gdm.pid - fi - [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary - ;; - wdm) - EXE=/usr/bin/wdm - PIDFILE= - ;; - gpe) - EXE=/usr/bin/gpe-dm - PIDFILE=/run/gpe-dm.pid - ;; - lxdm) - EXE=/usr/sbin/lxdm-binary - PIDFILE=/run/lxdm.pid - START_STOP_ARGS="--background" - ;; - lightdm) - EXE=/usr/sbin/lightdm - PIDFILE=/run/lightdm.pid - START_STOP_ARGS="--background" - ;; - sddm) - EXE="/usr/bin/sddm" - START_STOP_ARGS="-m --background" - PIDFILE=/run/sddm.pid - ;; - *) - # first find out if there is such executable - 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 - if [ -z "${EXE}" ]; then - echo "ERROR: Your XDM value is invalid." - echo " No ${MY_XDM} executable could be found on your system." - fi - ;; - esac - - if ! [ -x "${EXE}" ]; then - EXE=/usr/bin/xdm - PIDFILE=/run/xdm.pid - if ! [ -x "/usr/bin/xdm" ]; then - echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," - echo " or install x11-apps/xdm package" - eend 255 - fi - fi -} - -# Check to see if something is defined on our VT -vtstatic() { - if [ -e /etc/inittab ] ; then - grep -Eq "^[^#]+.*\" /etc/inittab - elif [ -e /etc/ttys ] ; then - grep -q "^ttyv$(($1 - 1))" /etc/ttys - else - return 1 - fi -} - -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 - return 0 - fi - - ebegin "Setting up ${EXE##*/}" - - # save the prefered DM - save_options "service" "${EXE}" - save_options "name" "${NAME}" - save_options "pidfile" "${PIDFILE}" - save_options "start_stop_args" "${START_STOP_ARGS}" - save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}" - - if [ -n "${CHECKVT-y}" ] ; then - if vtstatic "${CHECKVT:-7}" ; then - if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then - ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" - telinit a >/dev/null 2>&1 - return 0 - else - eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" - return 1 - fi - fi - fi - - /etc/X11/startDM.sh - eend 0 -} - -stop() { - local curvt retval - - retval=0 - if [ -t 0 ]; then - if type fgconsole >/dev/null 2>&1; then - curvt=$(fgconsole 2>/dev/null) - else - curvt=$(tty) - case "${curvt}" in - /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; - *) curvt= ;; - esac - fi - fi - local myexe myname mypidfile myservice - myexe=$(get_options "service") - myname=$(get_options "name") - mypidfile=$(get_options "pidfile") - myservice=${myexe##*/} - yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup") - - [ -z "${myexe}" ] && return 0 - - ebegin "Stopping ${myservice}" - - if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then - start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ - ${mypidfile:+--pidfile} ${mypidfile} \ - ${myname:+--name} ${myname} - retval=${?} - fi - - # switch back to original vt - if [ -n "${curvt}" ]; then - if type chvt >/dev/null 2>&1; then - chvt "${curvt}" - else - vidcontrol -s "$((curvt + 1))" - fi - fi - - eend ${retval} "Error stopping ${myservice}" - return ${retval} -} - -# vim: set ts=4 : -- cgit v1.2.2