diff options
-rw-r--r-- | doc/iscsid.8 | 2 | ||||
-rw-r--r-- | etc/initd/initd.debian | 2 | ||||
-rw-r--r-- | etc/initd/initd.redhat | 10 | ||||
-rw-r--r-- | iscsiuio/docs/iscsiuio.8 | 2 | ||||
-rw-r--r-- | iscsiuio/src/unix/main.c | 2 | ||||
-rw-r--r-- | libopeniscsiusr/idbm.c | 2 | ||||
-rw-r--r-- | usr/initiator.h | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/doc/iscsid.8 b/doc/iscsid.8 index d6b32dd..6f9218f 100644 --- a/doc/iscsid.8 +++ b/doc/iscsid.8 @@ -40,7 +40,7 @@ do not write a process ID file. .TP .BI [-p|--pid=]\fIpid\-file\fP write process ID to \fIpid\-file\fR rather than the default -\fI/var/run/iscsid.pid\fR +\fI/run/iscsid.pid\fR .TP .BI [-h|--help] display this help and exit 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}" diff --git a/iscsiuio/docs/iscsiuio.8 b/iscsiuio/docs/iscsiuio.8 index eda20c7..ea2ae02 100644 --- a/iscsiuio/docs/iscsiuio.8 +++ b/iscsiuio/docs/iscsiuio.8 @@ -71,7 +71,7 @@ This is to print the version. .PP .TP .BI -p|--pid <pidfile> -Use pidfile (default /var/run/iscsiuio.pid ) +Use pidfile (default /run/iscsiuio.pid ) .PP .TP .BI -h|--help diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c index 39d5339..370f8dc 100644 --- a/iscsiuio/src/unix/main.c +++ b/iscsiuio/src/unix/main.c @@ -76,7 +76,7 @@ ******************************************************************************/ #define PFX "main " -static const char default_pid_filepath[] = "/var/run/iscsiuio.pid"; +static const char default_pid_filepath[] = "/run/iscsiuio.pid"; /******************************************************************************* * Global Variables diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c index 677139e..d020e6c 100644 --- a/libopeniscsiusr/idbm.c +++ b/libopeniscsiusr/idbm.c @@ -93,7 +93,7 @@ #define ISCSI_END_REC "# END RECORD" #ifndef LOCK_DIR -#define LOCK_DIR "/var/lock/iscsi" +#define LOCK_DIR "/run/lock/iscsi" #endif #define LOCK_FILE LOCK_DIR"/lock" #define LOCK_WRITE_FILE LOCK_DIR"/lock.write" diff --git a/usr/initiator.h b/usr/initiator.h index 841590a..eccafb9 100644 --- a/usr/initiator.h +++ b/usr/initiator.h @@ -38,9 +38,9 @@ #define CONFIG_FILE ISCSI_CONFIG_ROOT"iscsid.conf" #define INITIATOR_NAME_FILE ISCSI_CONFIG_ROOT"initiatorname.iscsi" -#define PID_FILE "/var/run/iscsid.pid" +#define PID_FILE "/run/iscsid.pid" #ifndef LOCK_DIR -#define LOCK_DIR "/var/lock/iscsi" +#define LOCK_DIR "/run/lock/iscsi" #endif #define LOCK_FILE LOCK_DIR"/lock" #define LOCK_WRITE_FILE LOCK_DIR"/lock.write" |