aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-08-06 10:36:34 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-08-07 09:45:43 -0300
commit8a337ec1b0bc727d9a5be4d794cfb2b0084cf77b (patch)
treea6ea2c5a0fb07ec6df542cabdc27e2c736c43440
parent8a3960a9f0df3d4b494f0ef93d9c843109eb31fc (diff)
downloadaports-8a337ec1b0bc727d9a5be4d794cfb2b0084cf77b.tar.bz2
aports-8a337ec1b0bc727d9a5be4d794cfb2b0084cf77b.tar.xz
testing/gdm: use supervise-daemon for running gdm
-rw-r--r--testing/gdm/APKBUILD4
-rw-r--r--[-rwxr-xr-x]testing/gdm/gdm.initd17
2 files changed, 8 insertions, 13 deletions
diff --git a/testing/gdm/APKBUILD b/testing/gdm/APKBUILD
index 00eedc8529..4f11c525b8 100644
--- a/testing/gdm/APKBUILD
+++ b/testing/gdm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gdm
pkgver=3.32.0
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME display manager"
url="https://wiki.gnome.org/Projects/GDM"
arch="all !aarch64 !armhf !armv7 !s390x"
@@ -47,5 +47,5 @@ package() {
}
sha512sums="88016d0f800030a561e0360c63fdcb8499a605126f99a5a9f89606e086d7a934afc091843b2acd9091c1c643e7468ee31ae9a5b6264ae38064618ad577ef7ac0 gdm-3.32.0.tar.xz
-5893f594cebaa35bcc1bbc90b0b37aacab54c33cf5a46cf54722ea7bf6910804895df4db410df7d1e7d7a9b00cb8c65ce8caee7ecf1bc21763e30c96fd2d1bca gdm.initd
+879b6323c16a235dbdfdb670b932a30e0504253cf7a87229ba846ad50ffb5a4541573d4ba8551f19c88edbace81c7f8f164b90cf93f1a2600c71477a54c1e221 gdm.initd
f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82 Xsession"
diff --git a/testing/gdm/gdm.initd b/testing/gdm/gdm.initd
index 4c4d63df5d..d4c468bfd7 100755..100644
--- a/testing/gdm/gdm.initd
+++ b/testing/gdm/gdm.initd
@@ -1,18 +1,13 @@
#!/sbin/openrc-run
-GDM_LOG_FILE="/var/log/${SVCNAME}.log"
+supervisor=supervise-daemon
-description="GNOME display manager"
-command=/usr/sbin/${SVCNAME}
-command_args="${gdm_opts}"
-command_background="true"
-start_stop_daemon_args="-w 100 --stdout $GDM_LOG_FILE --stderr $GDM_LOG_FILE"
-pidfile="/run/${SVCNAME}.pid"
+name="Display Manager"
+description="GNOME Display Manager"
-start_pre() {
- checkpath -f -m 0644 -o ${SVCNAME}:${SVCNAME} "$GDM_LOG_FILE"
-}
+command=/usr/sbin/gdm
+command_args="$GDM_OPTS"
depend() {
- need net dbus
+ need net dbus
}