diff options
| author |   Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2016-10-31 10:05:11 +0800 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2016-11-29 08:22:21 -0800 |
| commit | 6ea4941ee0ac02cbdd6b8c857a89dbadce4413a4 (patch) | |
| tree | c4bc549fdcc2d693ba2d00a0ebefc49e94b415c8 /meta-networking/recipes-daemons | |
| parent | dbabbd8bf33de6cc46818dbb0602ec798ea5efb4 (diff) | |
| download | meta-openembedded-contrib-6ea4941ee0ac02cbdd6b8c857a89dbadce4413a4.tar.gz | |
iscsi-initiator-utils: fix postinstall and systemd service file
Fix postinstall and systemd service file so that the postinstall script does
not fail at rootfs time.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
(cherry picked from commit 816c723aa5b4c106dcc37815a5691173f9f02af1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons')
3 files changed, 24 insertions, 16 deletions
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service index b1397513bb..3790daebdc 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service @@ -5,6 +5,7 @@ After=syslog.target [Service] EnvironmentFile=/etc/default/iscsi-initiator ExecStartPre=/sbin/modprobe iscsi_tcp +ExecStartPre=/usr/lib/iscsi/set_initiatorname ExecStart=/usr/sbin/iscsid -f $OPTS_ISCSID [Install] diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname new file mode 100644 index 0000000000..a196c6b79d --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname @@ -0,0 +1,12 @@ +#!/bin/sh +if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then + INITIATORNAME=$(iscsi-iname) + cat >/etc/iscsi/initiatorname.iscsi <<EOF +## DO NOT EDIT OR REMOVE THIS FILE! +## If you remove this file, the iSCSI daemon will not start. +## If you change the InitiatorName, existing access control lists +## may reject this initiator. The InitiatorName must be unique +## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames. +InitiatorName=$INITIATORNAME +EOF +fi 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 03f64594cf..4b13155cd2 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 @@ -21,6 +21,7 @@ SRC_URI = "http://www.open-iscsi.org/bits/open-iscsi-${PV}.tar.gz \ file://iscsi-initiator \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ + file://set_initiatorname \ " SRC_URI[md5sum] = "8b8316d7c9469149a6cc6234478347f7" SRC_URI[sha256sum] = "7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9" @@ -82,6 +83,8 @@ do_install () { install -m 0644 ${WORKDIR}/iscsi-initiator.service \ ${WORKDIR}/iscsi-initiator-targets.service \ ${D}${systemd_unitdir}/system/ + install -d ${D}${nonarch_libdir}/iscsi + install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi else install -d ${D}/etc/default/volatiles install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles @@ -89,25 +92,17 @@ do_install () { } pkg_postinst_${PN}() { - #default there is no initiatorname.iscsi installed - #but it is needed or iscsid will fail - - #will run only when postinst on target - if [ "x$D" != "x" ]; then - exit 1 - fi - if [ ! -f ${sysconfdir}/iscsi/initiatorname.iscsi ]; then - echo "InitiatorName=$(${sbindir}/iscsi-iname)" > \ - ${sysconfdir}/iscsi/initiatorname.iscsi - fi - - if [ -e /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - elif command -v systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf + if [ "x$D" = "x" ]; then + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + elif command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf + fi fi } SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " INITSCRIPT_NAME = "iscsid" INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." + +FILES_${PN} += "${nonarch_libdir}/iscsi" |