[arch-commits] Commit in open-iscsi/trunk (4 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Thu May 15 14:54:24 UTC 2014
Date: Thursday, May 15, 2014 @ 16:54:24
Author: spupykin
Revision: 111250
Modified:
open-iscsi/trunk/PKGBUILD
open-iscsi/trunk/open-iscsi.install
Deleted:
open-iscsi/trunk/open-iscsi
open-iscsi/trunk/open-iscsi.conf.d
--------------------+
PKGBUILD | 5 -
open-iscsi | 154 ---------------------------------------------------
open-iscsi.conf.d | 15 ----
open-iscsi.install | 7 --
4 files changed, 6 insertions(+), 175 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-15 14:53:51 UTC (rev 111249)
+++ PKGBUILD 2014-05-15 14:54:24 UTC (rev 111250)
@@ -12,8 +12,9 @@
license=('GPL')
depends=('bash')
install=$pkgname.install
-backup=('etc/iscsi/iscsid.conf' 'etc/iscsi/initiatorname.iscsi')
-source=("http://www.open-iscsi.org/bits/${pkgname}-${_pkgver}.tar.gz" \
+backup=('etc/iscsi/iscsid.conf'
+ 'etc/iscsi/initiatorname.iscsi')
+source=("http://www.open-iscsi.org/bits/${pkgname}-${_pkgver}.tar.gz"
"open-iscsi.service")
options=('docs')
sha256sums=('7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9'
Deleted: open-iscsi
===================================================================
--- open-iscsi 2014-05-15 14:53:51 UTC (rev 111249)
+++ open-iscsi 2014-05-15 14:54:24 UTC (rev 111250)
@@ -1,154 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# general config
-[ -f /etc/conf.d/open-iscsi ] && . /etc/conf.d/open-iscsi
-
-# Set defaults if settings are missing
-[ -z "${ISCSID_ARGS}" ] && ISCSID_ARGS=""
-[ -z "$SEC_BEFORE_MOUNT" ] && SEC_BEFORE_MOUNT=2
-[ -z "$ISCSIADM_EXTRAARGS" ] && ISCSIADM_EXTRAARGS=""
-DAEMON_NAME="open-iscsi"
-ISCSIADM=/sbin/iscsiadm
-PIDFILE=/var/run/iscsid.pid
-
-case "$1" in
- start)
- modprobe -q iscsi_tcp &>/dev/null
- modprobe -q ib_iser &>/dev/null
-
- stat_busy "Starting Open-iSCSI daemon"
- /sbin/iscsid ${ISCSID_ARGS}
- if [ $? -ne 0 ]; then
- stat_fail
- exit 2
- else
- add_daemon $DAEMON_NAME
- stat_done
- fi
-
- if [ -n "$SERVER" ]; then
- stat_busy "Discovering targets"
- $ISCSIADM -m discovery -t sendtargets -p $SERVER $ISCSIADM_EXTRAARGS > /dev/null
- if [ $? -ne 0 ]; then
- stat_fail
- exit 3
- else
- stat_done
- fi
-
- stat_busy "Login to all portals"
- $ISCSIADM -m node -L all > /dev/null
- if [ $? -ne 0 ]; then
- stat_fail
- exit 4
- else
- stat_done
- fi
-
- if [[ "$MOUNT" != "" ]]; then
- # wait n seconds to settle
- sleep $SEC_BEFORE_MOUNT
- status "Mounting devices"
- for MTPT in ${MOUNT[@]}; do
- stat_busy "mounting $MTPT"
- mount $MTPT
- sleep 1
- if [ $? -eq 0 ]; then
- stat_done
- else
- stat_fail
- fi
- done
- else
- status "No devices to mount defined"
- fi
- fi
- ;;
- stop)
- if [[ "$MOUNT" != "" ]]; then
- status "Unmounting devices"
- # unmounting in reverse order
- LEN=${#MOUNT[@]}
- while [ $LEN -ne 0 ]; do
- let LEN=$LEN-1;
- UMOUNT="$UMOUNT ${MOUNT[$LEN]}";
- done
- for MTPT in $UMOUNT; do
- MOUNTED=$(mount|grep -c `/usr/bin/readlink -mns $MTPT`)
- if [ $MOUNTED -ne 0 ]; then
- stat_busy "unmounting $MTPT"
- umount $MTPT
- sleep 1
- if [ $? -eq 0 ]; then
- stat_done
- else
- stat_fail
- exit 5
- fi
- else
- status "$MTPT not mounted"
- fi
- done
- sleep 2
- else
- status "No devices to unmount defined"
- fi
-
- $ISCSIADM -m session $> /dev/null
- if [ $? -eq 0 ]; then
- stat_busy "Logout to all portals"
- $ISCSIADM -m node -U all > /dev/null
- if [ $? -ne 0 ]; then
- stat_fail
- exit 6
- else
- stat_done
- fi
- fi
-
- stat_busy "Stopping Open-iSCSI daemon"
- [ -f $PIDFILE ] && kill -9 `cat $PIDFILE` &> /dev/null
- if [ $? -ne 0 ]; then
- stat_fail
- else
- rm -f $PIDFILE
- killall iscsid > /dev/null
- rm_daemon $DAEMON_NAME
- stat_done
- fi
- ;;
- status)
- status "Open-iSCSI status"
- ck_daemon $DAEMON_NAME
- status "Available portals on node"
- echo
- echo -ne " "
- /sbin/iscsiadm -m node
- echo
- status "Connected portals for this session"
- echo
- echo -ne " "
- /sbin/iscsiadm -m session
- echo
- ;;
- statusv)
- status "Open-iSCSI status"
- ck_daemon $DAEMON_NAME
- status "Detailed session info"
- echo
- $ISCSIADM -m session -P 2
- echo
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|status|statusv|restart}"
- ;;
-esac
-exit 0
Deleted: open-iscsi.conf.d
===================================================================
--- open-iscsi.conf.d 2014-05-15 14:53:51 UTC (rev 111249)
+++ open-iscsi.conf.d 2014-05-15 14:54:24 UTC (rev 111250)
@@ -1,15 +0,0 @@
-# Parameters to be passed to the iscsid daemon.
-ISCSID_ARGS=""
-
-# iSCSI server IP which will be discovered by iscsiadm
-SERVER=""
-
-# mountpoints from fstab to mount (first entry will be mounted first, and so on)
-# example: MOUNT=(/dev/sdb1 /dev/sdb2)
-MOUNT=()
-
-# wait n seconds before mounting connected nodes
-SEC_BEFORE_MOUNT=2
-
-# Extra arguments to pass to iscsiadm
-ISCSIADM_EXTRAARGS=""
Modified: open-iscsi.install
===================================================================
--- open-iscsi.install 2014-05-15 14:53:51 UTC (rev 111249)
+++ open-iscsi.install 2014-05-15 14:54:24 UTC (rev 111250)
@@ -1,10 +1,9 @@
-## arg 1: the new package version
post_install() {
- if [ -z $(</etc/iscsi/initiatorname.iscsi) ]; then
- name=$(iscsi-iname)
+ if [ -z $(<etc/iscsi/initiatorname.iscsi) ]; then
+ name=$(iscsi-iname)
echo
echo ">>> Setting Initiatorname '$name'"
- echo "InitiatorName=$name" > /etc/iscsi/initiatorname.iscsi
+ echo "InitiatorName=$name" >etc/iscsi/initiatorname.iscsi
fi
}
More information about the arch-commits
mailing list