userman: recipe/service update
Use dbus and systemd class features.
Change-Id: I4567237a1badaa2d79a2b133de5bffbd3b1ccda5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/common/recipes-phosphor/users/obmc-phosphor-user.bb b/common/recipes-phosphor/users/obmc-phosphor-user.bb
index 3357edb..5f63b62 100644
--- a/common/recipes-phosphor/users/obmc-phosphor-user.bb
+++ b/common/recipes-phosphor/users/obmc-phosphor-user.bb
@@ -3,9 +3,10 @@
HOMEPAGE = "http://github.com/openbmc/phosphor-networkd"
PR = "r1"
+inherit allarch
inherit obmc-phosphor-license
inherit obmc-phosphor-user-mgmt
-inherit obmc-phosphor-systemd
+inherit obmc-phosphor-dbus-service
RDEPENDS_${PN} += "python-dbus python-pygobject python-pexpect"
@@ -16,6 +17,8 @@
S = "${WORKDIR}/git"
INSTALL_NAME = "userman.py"
+DBUS_SERVICE_${PN} += "org.openbmc.UserManager.service"
+
# Since base_do_compile finds a makefile (from networkd) it tries to
# compile. Short-circuit that because we just need to copy a python
# file in this package.
@@ -23,7 +26,7 @@
:
}
-do_install() {
+do_install_append() {
echo "***installing $INSTALL_NAME"
install -d ${D}/${sbindir}
install ${S}/${INSTALL_NAME} ${D}/${sbindir}/obmc-phosphor-userd
diff --git a/common/recipes-phosphor/users/obmc-phosphor-user/obmc-phosphor-user.service b/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
similarity index 86%
rename from common/recipes-phosphor/users/obmc-phosphor-user/obmc-phosphor-user.service
rename to common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
index 1c79f51..d835990 100644
--- a/common/recipes-phosphor/users/obmc-phosphor-user/obmc-phosphor-user.service
+++ b/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
@@ -5,6 +5,8 @@
ExecStart={sbindir}/obmc-phosphor-userd
Environment="PYTHONUNBUFFERED=1"
Restart=always
+Type=dbus
+BusName={BUSNAME}
[Install]
WantedBy={SYSTEMD_DEFAULT_TARGET}