From 0f30033765cfd3769a1b65a6b84ee982eb1052f8 Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Tue, 14 May 2019 08:50:14 -0700
Subject: Stop using /var directory for PIDfile and locks

Convert /var/run to /run, and convert /var/lock to /run/lock,
as per modern requirements on use of the /var directory.
---
 etc/initd/initd.debian |  2 +-
 etc/initd/initd.redhat | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'etc')

diff --git a/etc/initd/initd.debian b/etc/initd/initd.debian
index 59bf59b..b531be5 100644
--- a/etc/initd/initd.debian
+++ b/etc/initd/initd.debian
@@ -11,7 +11,7 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/sbin/iscsid
 ADM=/sbin/iscsiadm
-PIDFILE=/var/run/iscsid.pid
+PIDFILE=/run/iscsid.pid
 
 [ -x "$DAEMON" ] || exit 0
 
diff --git a/etc/initd/initd.redhat b/etc/initd/initd.redhat
index d149082..568f0cf 100644
--- a/etc/initd/initd.redhat
+++ b/etc/initd/initd.redhat
@@ -4,7 +4,7 @@
 # description: Starts and stops the iSCSI initiator
 #
 # processname: iscsid
-# pidfile: /var/run/iscsid.pid
+# pidfile: /run/iscsid.pid
 # config:  /etc/iscsi/iscsid.conf
 
 # Source function library.
@@ -23,7 +23,7 @@ start()
 	echo
 	[ $RETVAL -eq 0 ] || return
 
-	touch /var/lock/subsys/open-iscsi
+	touch /run/lock/subsys/open-iscsi
 
 	echo -n $"Setting up iSCSI targets: "
 	iscsiadm -m node --loginall=automatic
@@ -43,8 +43,8 @@ stop()
 		return $RETVAL
 	fi
 	iscsiadm -k 0
-	rm -f /var/run/iscsid.pid
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/open-iscsi
+	rm -f /run/iscsid.pid
+	[ $RETVAL -eq 0 ] && rm -f /run/lock/subsys/open-iscsi
 	status=0
 	modprobe -r iscsi_tcp 2>/dev/null
 	if [ "$?" -ne "0" -a "$?" -ne "1" ]; then
@@ -94,7 +94,7 @@ case "$1" in
 			RETVAL=$?
 			;;
 	condrestart)
-			[ -f /var/lock/subsys/open-iscsi ] && restart
+			[ -f /run/lock/subsys/open-iscsi ] && restart
 			;;
 	*)
 			echo $"Usage: $0 {start|stop|restart|status|condrestart}"
-- 
cgit v1.2.1