diff --git a/srcpkgs/gdm/files/gdm.rc b/srcpkgs/gdm/files/gdm.rc deleted file mode 100644 index c291b218981..00000000000 --- a/srcpkgs/gdm/files/gdm.rc +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript - -command=/usr/sbin/gdm-binary - -depend() -{ - need dbus -} - -start() -{ - ebegin "Starting GDM" - start-stop-daemon --start --exec ${command} --background - eend $? -} - -stop() -{ - ebegin "Stopping GDM" - start-stop-daemon --stop --exec ${command} - eend $? -} diff --git a/srcpkgs/gdm/files/gdm.service b/srcpkgs/gdm/files/gdm.service new file mode 100644 index 00000000000..d67919fa3fb --- /dev/null +++ b/srcpkgs/gdm/files/gdm.service @@ -0,0 +1,10 @@ +[Unit] +Description=Gnome Display Manager +Requires=dev-tty7.device +After=dev-tty7.device systemd-user-sessions.service + +[Service] +ExecStart=/usr/sbin/gdm -nodaemon + +[Install] +WantedBy=graphical.target diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 78c5fff157c..257d7ffab86 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.2.0 -revision=1 +revision=2 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" build_style=gnu_configure configure_args="--disable-schemas-install --disable-scrollkeeper @@ -45,7 +45,7 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor" system_accounts="gdm" gdm_homedir="/var/lib/gdm" gdm_groups="video" -openrc_services="gdm default true" +systemd_services="gdm.service" Add_dependency run glibc Add_dependency run glib @@ -100,8 +100,8 @@ post_install() gdm-welcome; do vinstall ${FILESDIR}/${f}.pam 644 etc/pam.d ${f} done - # Install OpenRC service. - install -Dm755 ${FILESDIR}/gdm.rc ${DESTDIR}/etc/init.d/gdm + # Install systemd service. + vinstall ${FILESDIR}/gdm.service 644 lib/systemd/system # Install GConf schema. mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}