diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-06-10 18:38:31 -0500 |
|---|---|---|
| committer | Mike Christie <michaelc@cs.wisc.edu> | 2010-06-10 18:38:31 -0500 |
| commit | 3b415b25baf3e0f95a07562d0533ba89bd5a4694 (patch) | |
| tree | e4fb03fed7f6f86a45f6ee20f01eae6b6812ed45 | |
| parent | d94b673cdcf2a52bfb5188951f8959116e90469e (diff) | |
| download | open-iscsi-3b415b25baf3e0f95a07562d0533ba89bd5a4694.tar.gz | |
iscsi scripts: use iscsiadm -k to shutdown daemon
This has the suse and red hat scripts use the iscsiadm
kill command to shutdown the daemon. This is needed
so if the discovery daemon is used then it will be
cleanly stopped.
This does not modify the debian script because I was
not sure what the start-stop stuff was doing and did not
want to add a bug.
| -rw-r--r-- | etc/initd/initd.redhat | 2 | ||||
| -rw-r--r-- | etc/initd/initd.suse | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/initd/initd.redhat b/etc/initd/initd.redhat index c767cfb..5828258 100644 --- a/etc/initd/initd.redhat +++ b/etc/initd/initd.redhat @@ -44,7 +44,7 @@ stop() echo "Could not logout from all nodes, try again later" return $RETVAL fi - killproc iscsid + iscsiadm -k 0 rm -f /var/run/iscsid.pid [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/open-iscsi status=0 diff --git a/etc/initd/initd.suse b/etc/initd/initd.suse index bdb4dc7..2184bb5 100644 --- a/etc/initd/initd.suse +++ b/etc/initd/initd.suse @@ -157,7 +157,7 @@ case "$1" in stop) iscsi_umount_all_luns if iscsi_logout_all_nodes ; then - killproc -KILL $DAEMON + iscsiadm -k 0 RETVAL=$? else RETVAL=1 |