From af0d16280705cea9252f8f184be7626f8a18be0d Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Wed, 22 Nov 2017 16:38:15 +0900 Subject: [PATCH] spec: Change useradd/groupadd to handle in security-manager. I left useradd/groupadd to make this package available from open source without security-manager. Signed-off-by: INSUN PYO Change-Id: I3348c321a44df01c082c36bc09844a122adb669a --- packaging/dbus.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packaging/dbus.spec b/packaging/dbus.spec index 020b2667..0478d4cf 100644 --- a/packaging/dbus.spec +++ b/packaging/dbus.spec @@ -1,5 +1,3 @@ -%define dbus_user_uid 81 - %bcond_with coverage # Do not create provides from extension .so files because the main package @@ -36,7 +34,10 @@ Source4: baselibs.conf Source7: dbus.sh Source1001: dbus.manifest # COMMON1-END -Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd +Requires: security-config +Requires(pre): /usr/bin/getent +Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/groupadd Provides: dbus-1 %description @@ -281,9 +282,9 @@ install -m 0644 coverage-objects/* %{cov_lib_dir}/objects %pre # Add the "dbus" user and group -/usr/sbin/groupadd -r -g %{dbus_user_uid} dbus 2>/dev/null || : -/usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \ - -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : +getent group dbus > /dev/null || /usr/sbin/groupadd -r -g 81 dbus 2> /dev/null || : +getent passwd dbus > /dev/null || /usr/sbin/useradd -c 'System message bus' -u 81 -g 81 \ + -s /sbin/nologin -r -d '/' dbus 2> /dev/null || : %post -n dbus-libs-extension-kdbus pushd %{_libdir} -- 2.34.1