Commit b75c6146 authored by Leonardo Arena's avatar Leonardo Arena
Browse files

main/open-iscsi: install daemon binaries into /usr/sbin

Move some init defaults to init script

Fixes #12768
parent e6408876
......@@ -31,15 +31,15 @@ build() {
}
package() {
make prefix=/usr DESTDIR="$pkgdir" install
make prefix=/usr exec_prefix=/usr DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/iscsid.initd "$pkgdir"/etc/init.d/iscsid
install -Dm644 "$srcdir"/iscsid.confd "$pkgdir"/etc/conf.d/iscsid
install -Dm644 "$srcdir"/iscsid.conf "$pkgdir"/etc/iscsi/iscsid.conf
}
sha512sums="ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3 open-iscsi-2.1.4.tar.gz
febf67065c133fd2f79d5aff509891d557af25739b700e961d2289a941b447099021b01fa29817bcd057147adad3a3f8948049d4f8ff3590cb7255a0fa0d715c iscsid.initd
075bb9cb783be7ccbc799947e0e042b85310d40b3045141dc1be40ca84ed1cc0e1e54559df501c512c179e28375314b27a03c15d9a6d4b1cabd428b2279985d3 iscsid.confd
a95bfdb9cc10d154a257fdaecc41d351eeed8b460bbc9c548c0891485de09a0eb98c2ff68cc2db15e6d820ebba33c43f2e72853cdeca359eb15d820a9cdf542d iscsid.initd
3ba1825ee8b39ce2c58d70b59d6c2d6a954a8c65ce9adf920fb44d046cfe0f7f54bcc70f3f3c24754f0e866abdc92b4a1716fb516c45278b217532b97a6d948a iscsid.confd
4cc7c1923047616d908806aab96d468cb7b99ff9f8a9e02a039866b66db4ae856bd9f414854712d8a57c21614674f4468736bce26a4199c2ff054a165bca26e0 iscsid.conf
1b89ffd6de0dc7bb63fc2702a97e49df4369158c66ee609acfc041b1677c07fbd964b7a709f1f324fa51a9842d4d3e11611d9783e18d526372d468163c0ac8db musl-fixes.patch
104b559eb368459a7151657fbca63927b6b1032bda272e903a1633c8b9d3ed199f2c5cca0e6741bcd5fa6e860d1ff2d111caf58d60d9f0a736ad767e8ae0427b add-missing-headers.patch
......
# /etc/conf.d/iscsid
# config file to use
CONFIG_FILE=/etc/iscsi/iscsid.conf
# you need to specify an initiatorname in the file
INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi
# options to pass to iscsid
OPTS="-i ${INITIATORNAME_FILE}"
# Start automatic targets when iscsid is started
AUTOSTARTTARGETS="yes"
# OPTS=""
......@@ -2,15 +2,19 @@
# Copyright 1999-2015 Gentoo Foundation, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
command=/sbin/iscsid
command=/usr/sbin/iscsid
command_args="${OPTS}"
start_stop_daemon_args="-w 100" # iscsid might fail e.g. when the iSCSI kernel modules aren't available
pidfile=${PIDFILE:-/var/run/${SVCNAME}.pid}
start_stop_daemon_args="-w 100 -i ${INITIATORNAME_FILE}" # iscsid might fail e.g. when the iSCSI kernel modules aren't available
pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
: ${CONFIG_FILE:="/etc/iscsi/iscsid.conf"}
: ${INITIATORNAME_FILE:="/etc/iscsi/initiatorname.iscsi"}
: ${AUTOSTARTTARGETS:="yes"}
extra_started_commands="starttargets stoptargets"
extra_commands="restarttargets"
ISCSIADM=/sbin/iscsiadm
ISCSIADM=/usr/sbin/iscsiadm
depend() {
after modules multipath
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment