Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 222553 Details for
Bug 307619
sys-block/open-iscsi - broken initscript
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
iscsid-init.d.patch
iscsid-init.d.patch (text/plain), 2.05 KB, created by
Stefan Behte (RETIRED)
on 2010-03-07 19:49:59 UTC
(
hide
)
Description:
iscsid-init.d.patch
Filename:
MIME Type:
Creator:
Stefan Behte (RETIRED)
Created:
2010-03-07 19:49:59 UTC
Size:
2.05 KB
patch
obsolete
>--- /tmp/iscsid 2010-03-07 20:06:09.000000000 +0100 >+++ iscsid-init.d 2010-03-07 20:46:40.000000000 +0100 >@@ -1,7 +1,7 @@ > #!/sbin/runscript >-# Copyright 1999-2008 Gentoo Technologies, Inc. >+# Copyright 1999-2010 Gentoo Technologies, Inc. > # Distributed under the terms of the GNU General Public License, v2 or later >-# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d,v 1.1 2009/11/12 09:29:48 robbat2 Exp $ >+# $Header: $ > > opts="${opts} starttargets stoptargets restarttargets" > >@@ -10,6 +10,9 @@ > use net > } > >+PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid} >+BINARY="/usr/sbin/iscsid" >+ > checkconfig() { > if [ ! -e /etc/conf.d/${SVCNAME} ]; then > eerror "Config file /etc/conf.d/${SVCNAME} does not exist!" >@@ -71,7 +74,7 @@ > fi > > ebegin "Starting ${SVCNAME}" >- start-stop-daemon --start --quiet --exec /usr/sbin/iscsid -- ${OPTS} >+ start-stop-daemon --start --quiet --exec ${BINARY} -- ${OPTS} > ret=$? > if [ $ret -ne 0 ]; then > eend $? >@@ -81,7 +84,11 @@ > # Start automatic targets when iscsid is started > if [ "${AUTOSTARTTARGETS}" = "yes" ]; then > starttargets >- return $? >+ ret=$? >+ if [ "${AUTOSTART}" = "strict" ] && [ $ret -ne 0 ]; then >+ stop >+ return $ret >+ fi > fi > return 0 > } >@@ -89,12 +96,9 @@ > stop() { > stoptargets > ebegin "Stopping ${SVCNAME}" >- start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE >+ start-stop-daemon --stop --quiet --exec ${BINARY} --pidfile ${PIDFILE} > eend $? > >- # ugly, but pid file is not removed by iscsid >- rm -f $PID_FILE >- > do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r' > eend $? > } >@@ -102,18 +106,18 @@ > starttargets() { > ebegin "Setting up iSCSI targets" > /usr/sbin/iscsiadm -m node --loginall=automatic >- ret=$? >+ ret=$? > eend $ret >- return $ret >+ return $ret > } > > stoptargets() { > ebegin "Disconnecting iSCSI targets" > sync > /usr/sbin/iscsiadm -m node --logoutall=all >- ret=$? >+ ret=$? > eend $ret >- return $ret >+ return $ret > } > > restarttargets() {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 307619
:
221933
|
222547
|
222549
|
222551
| 222553 |
249972