lldpd: Switch to systemd sysusers mechanism for user/group creation

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm
index 0736fe31049b68f942060a441e95a76fb4cfeca2..56bb3aaa071273a2430929f4eaf1a40b6a5840ec 100644 (file)
--- a/lldpd/lldpd.nm
+++ b/lldpd/lldpd.nm
@@ -5,7 +5,7 @@
 
 name       = lldpd
 version    = 1.0.16
-release    = 2
+release    = 3
 
 groups     = Networking/Tools
 url        = https://lldpd.github.io
@@ -28,6 +28,7 @@ build
                pkg-config
                readline-devel
                shadow-utils
+               systemd-sysusers
        end
 
        configure_options += \
@@ -43,29 +44,10 @@ build
        else
                configure_options += --with-seccomp
        end
-
-       prepare_cmds
-               %{create_user}
-       end
-end
-
-create_user
-       getent group lldpd >/dev/null || groupadd -r lldpd
-       getent passwd lldpd >/dev/null || \
-               useradd -r -g lldpd -d / -s /sbin/nologin lldpd
 end
 
 packages
        package %{name}
-               prerequires
-                       shadow-utils
-                       systemd-units
-               end
-
-               script prein
-                       %{create_user}
-               end
-
                script postin
                        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
                end

diff --git a/lldpd/lldpd.sysusers b/lldpd/lldpd.sysusers
new file mode 100644 (file)
index 0000000..05c1957
--- /dev/null
+++ b/lldpd/lldpd.sysusers
@@ -0,0 +1 @@
+u lldpd - "User for lldpd service" / /usr/sbin/nologin