open-iscsi-user: Fix conflict error with systemd and net-snmp-server-snmptrapd.

- reinstall service files
- deleted older version

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
index b4b9ebc..8cedff4 100644
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
@@ -43,3 +43,13 @@ FILES:${PN} += " \
     ${systemd_system_unitdir}/iscsiuio.service \
     ${systemd_unitdir}/system-generators/ibft-rule-generator \
 "
+
+do_install:append() {
+    rm -rf ${D}${systemd_unitdir}/
+
+    install -d ${D}${systemd_unitdir}/system
+    install -d ${D}${systemd_unitdir}/system-generators
+    install -m 0644 ${S}/etc/systemd/*.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${S}/etc/systemd/*.socket ${D}${systemd_unitdir}/system/
+    install -m 0644 ${S}/etc/systemd/ibft-rule-generator ${D}${systemd_unitdir}/system-generators/
+}