From 2057dd443284f51aebb7d376cdd47e9b42aa8a18 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 Oct 2011 02:57:48 +0200 Subject: [PATCH] nscd: switch to systemd, drop openrc support. --- srcpkgs/glibc/files/nscd.rc | 23 ----------------------- srcpkgs/glibc/files/nscd.service | 12 ++++++++++++ srcpkgs/glibc/files/nscd.socket | 8 ++++++++ srcpkgs/glibc/files/nscd.tmpfiles.d | 1 + srcpkgs/glibc/nscd.template | 16 +++++++++------- 5 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/glibc/files/nscd.rc create mode 100644 srcpkgs/glibc/files/nscd.service create mode 100644 srcpkgs/glibc/files/nscd.socket create mode 100644 srcpkgs/glibc/files/nscd.tmpfiles.d diff --git a/srcpkgs/glibc/files/nscd.rc b/srcpkgs/glibc/files/nscd.rc deleted file mode 100644 index 0edee769f07..00000000000 --- a/srcpkgs/glibc/files/nscd.rc +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript - -command=/usr/sbin/nscd -pidfile=/var/run/nscd/nscd.pid - -depend() -{ - use dns ldap net slapd -} - -start_pre() -{ - if [ ! -d /var/run/nscd ]; then - mkdir -p /var/run/nscd - fi -} - -stop() -{ - ebegin "Stopping nscd" - ${command} -K - eend $? -} diff --git a/srcpkgs/glibc/files/nscd.service b/srcpkgs/glibc/files/nscd.service new file mode 100644 index 00000000000..22b9dd8e7a5 --- /dev/null +++ b/srcpkgs/glibc/files/nscd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Name Service Cache Daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/nscd +ExecStop=/usr/sbin/nscd --shutdown +Restart=always + +[Install] +WantedBy=multi-user.target +Also=nscd.socket diff --git a/srcpkgs/glibc/files/nscd.socket b/srcpkgs/glibc/files/nscd.socket new file mode 100644 index 00000000000..9b8da6f39a6 --- /dev/null +++ b/srcpkgs/glibc/files/nscd.socket @@ -0,0 +1,8 @@ +[Unit] +Description=Name Service Cache Daemon Socket + +[Socket] +ListenStream=/var/run/nscd/socket + +[Install] +WantedBy=sockets.target diff --git a/srcpkgs/glibc/files/nscd.tmpfiles.d b/srcpkgs/glibc/files/nscd.tmpfiles.d new file mode 100644 index 00000000000..b23fd3cc876 --- /dev/null +++ b/srcpkgs/glibc/files/nscd.tmpfiles.d @@ -0,0 +1 @@ +d /run/nscd 755 root root diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template index 2aa4a186ca7..35da5c29d5e 100644 --- a/srcpkgs/glibc/nscd.template +++ b/srcpkgs/glibc/nscd.template @@ -5,17 +5,19 @@ long_desc=" This package contains nscd, a daemon that provides a cache for the most common name service requests." -openrc_services="nscd default false" +revision=1 + +systemd_services="nscd.service" conf_files="/etc/nscd.conf" Add_dependency run glibc do_install() { - install -d ${DESTDIR}/usr/sbin - mv ${SRCPKGDESTDIR}/usr/sbin/nscd ${DESTDIR}/usr/sbin - install -D -m755 ${FILESDIR}/nscd.rc ${DESTDIR}/etc/init.d/nscd - install -D -m644 ${FILESDIR}/nscd.conf ${DESTDIR}/etc - install -D -m644 ${FILESDIR}/nscd.logrotate \ - ${DESTDIR}/etc/logrotate.d/nscd + vmove usr/sbin/nscd usr/sbin + vinstall ${FILESDIR}/nscd.service 644 lib/systemd/system + vinstall ${FILESDIR}/nscd.socket 644 lib/systemd/system + vinstall ${FILESDIR}/nscd.tmpfiles.d 644 usr/lib/tmpfiles.d nscd.conf + vinstall ${FILESDIR}/nscd.conf 644 etc + vinstall ${FILESDIR}/nscd.logrotate 644 etc/logrotate.d nscd }