Switch to systemd-sysusers and systemd-tmpfiles

Used for mpd user and dirs creation.

6 files changed, 23 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b932bd1c0cc4..2acdf698c65e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,17 +15,20 @@ pkgbase = mpd-server-minimal
 	depends = icu
 	depends = libmpdclient
 	depends = sqlite
+	depends = systemd
 	provides = mpd=0.19.21
 	conflicts = mpd
 	backup = etc/mpd.conf
 	source = https://www.musicpd.org//download/mpd/0.19/mpd-0.19.21.tar.xz
 	source = https://www.musicpd.org//download/mpd/0.19/mpd-0.19.21.tar.xz.sig
-	source = mpd.tmpfile
+	source = mpd.tmpfiles
+	source = mpd.sysusers
 	source = mpd.conf
 	validpgpkeys = 0392335A78083894A4301C43236E8A58C6DB4512
 	sha1sums = 27dd903f4f7c0f5ffeb85e6820c02d2b82485572
 	sha1sums = SKIP
-	sha1sums = f4d5922abb69abb739542d8e93f4dfd748acdad7
+	sha1sums = ba916e79db509a888ade94740249d35456ca1912
+	sha1sums = aa58b35ad28de86fdc9ee850e3989f1a105f6a80
 	sha1sums = 291fd5cda9f0845834a553017327c4586bd853f6
 
 pkgname = mpd-server-minimal
diff --git a/PKGBUILD b/PKGBUILD
index 0a07e5db222e..604bbd2b6b75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,18 +8,20 @@ pkgdesc="Flexible, powerful, server-side application for playing music. Minimal
 url="https://www.musicpd.org/"
 license=('GPL')
 arch=('i686' 'x86_64' 'armv7h')
-depends=('alsa-lib' 'flac' 'glib2' 'icu' 'libmpdclient' 'sqlite')
+depends=('alsa-lib' 'flac' 'glib2' 'icu' 'libmpdclient' 'sqlite' 'systemd')
 makedepends=('boost')
 provides=("${_pkgname}=$pkgver")
 conflicts=("${_pkgname}")
 backup=("etc/${_pkgname}.conf")
 install=mpd.install
 source=("${url}/download/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz"{,.sig}
-        "${_pkgname}.tmpfile"
+        "${_pkgname}.tmpfiles"
+        "${_pkgname}.sysusers"
         "${_pkgname}.conf")
 sha1sums=('27dd903f4f7c0f5ffeb85e6820c02d2b82485572'
           'SKIP'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
+          'ba916e79db509a888ade94740249d35456ca1912'
+          'aa58b35ad28de86fdc9ee850e3989f1a105f6a80'
           '291fd5cda9f0845834a553017327c4586bd853f6')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann
 
@@ -109,10 +111,10 @@ package() {
 
     make DESTDIR="${pkgdir}" install
 
-    install -Dm644 ../"${_pkgname}".conf "${pkgdir}"/etc/"${_pkgname}".conf
-    install -Dm644 ../"${_pkgname}".tmpfile "${pkgdir}"/usr/lib/tmpfiles.d/"${_pkgname}".conf
-    install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/{,playlists}
+    install -Dm644 "${srcdir}"/${_pkgname}.conf "${pkgdir}"/etc/${_pkgname}.conf
+    install -Dm644 "${srcdir}"/${_pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${_pkgname}.conf
+    install -Dm644 "${srcdir}"/${_pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${_pkgname}.conf
 
-    sed '/\[Service\]/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/"${_pkgname}".service
-    sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/system/"${_pkgname}".service
+    sed '/\[Service\]/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/${_pkgname}.service
+    sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/system/${_pkgname}.service
 }
diff --git a/mpd.install b/mpd.install
index cffab46a814e..891e1cc30e88 100644
--- a/mpd.install
+++ b/mpd.install
@@ -1,5 +1,4 @@
 post_install() {
-    getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null
-    getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null
-    usr/bin/systemd-tmpfiles --create mpd.conf || true
+    systemd-sysusers mpd.conf
+    systemd-tmpfiles --create mpd.conf
 }
diff --git a/mpd.sysusers b/mpd.sysusers
new file mode 100644
index 000000000000..43b3968b95b3
--- /dev/null
+++ b/mpd.sysusers
@@ -0,0 +1,3 @@
+u mpd 45 "Music Player Daemon" /var/lib/mpd
+m mpd mpd
+m mpd audio
diff --git a/mpd.tmpfile b/mpd.tmpfile
deleted file mode 100644
index 41c4e743a3a1..000000000000
--- a/mpd.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mpd 0755 mpd mpd
diff --git a/mpd.tmpfiles b/mpd.tmpfiles
new file mode 100644
index 000000000000..8e42cd363d09
--- /dev/null
+++ b/mpd.tmpfiles
@@ -0,0 +1,3 @@
+d /var/lib/mpd 0755 mpd mpd
+d /var/lib/mpd/playlists 0755 mpd mpd
+d /run/mpd 0755 mpd mpd