[oe-commits] Roy Li : iscsi-initiator-utils: fix the iscsid path in iscsid.conf
git at git.openembedded.org
git at git.openembedded.org
Mon Jan 26 15:41:07 UTC 2015
Module: meta-openembedded.git
Branch: master
Commit: ee3412f5023fab71a4744a4e1820e28d126b4eb4
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ee3412f5023fab71a4744a4e1820e28d126b4eb4
Author: Roy Li <rongqing.li at windriver.com>
Date: Fri Jan 23 10:29:34 2015 +0800
iscsi-initiator-utils: fix the iscsid path in iscsid.conf
iscsid is installed into ${sbindir}, which is /usr/sbin, not /sbin/,
so fix it in /etc/iscsi/iscsid.conf
Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
.../iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb
index d48cf24..f510ce5 100644
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb
+++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0-873.bb
@@ -69,6 +69,8 @@ do_install () {
install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi
install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid
+ sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf
+
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d /run/${BPN}/lock - - - -" \
More information about the Openembedded-commits
mailing list