[arch-commits] Commit in open-iscsi/repos (16 files)
Sergej Pupykin
spupykin at archlinux.org
Wed Feb 3 18:50:52 UTC 2016
Date: Wednesday, February 3, 2016 @ 19:50:51
Author: spupykin
Revision: 160095
archrelease: copy trunk to community-i686, community-x86_64
Added:
open-iscsi/repos/community-i686/PKGBUILD
(from rev 160094, open-iscsi/trunk/PKGBUILD)
open-iscsi/repos/community-i686/open-iscsi.install
(from rev 160094, open-iscsi/trunk/open-iscsi.install)
open-iscsi/repos/community-i686/open-iscsi.service
(from rev 160094, open-iscsi/trunk/open-iscsi.service)
open-iscsi/repos/community-x86_64/PKGBUILD
(from rev 160094, open-iscsi/trunk/PKGBUILD)
open-iscsi/repos/community-x86_64/open-iscsi.install
(from rev 160094, open-iscsi/trunk/open-iscsi.install)
open-iscsi/repos/community-x86_64/open-iscsi.service
(from rev 160094, open-iscsi/trunk/open-iscsi.service)
Deleted:
open-iscsi/repos/community-i686/PKGBUILD
open-iscsi/repos/community-i686/open-iscsi
open-iscsi/repos/community-i686/open-iscsi.conf.d
open-iscsi/repos/community-i686/open-iscsi.install
open-iscsi/repos/community-i686/open-iscsi.service
open-iscsi/repos/community-x86_64/PKGBUILD
open-iscsi/repos/community-x86_64/open-iscsi
open-iscsi/repos/community-x86_64/open-iscsi.conf.d
open-iscsi/repos/community-x86_64/open-iscsi.install
open-iscsi/repos/community-x86_64/open-iscsi.service
-------------------------------------+
/PKGBUILD | 104 ++++++++++++++++++++++
/open-iscsi.install | 24 +++++
/open-iscsi.service | 20 ++++
community-i686/PKGBUILD | 50 -----------
community-i686/open-iscsi | 154 ----------------------------------
community-i686/open-iscsi.conf.d | 15 ---
community-i686/open-iscsi.install | 13 --
community-i686/open-iscsi.service | 10 --
community-x86_64/PKGBUILD | 50 -----------
community-x86_64/open-iscsi | 154 ----------------------------------
community-x86_64/open-iscsi.conf.d | 15 ---
community-x86_64/open-iscsi.install | 13 --
community-x86_64/open-iscsi.service | 10 --
13 files changed, 148 insertions(+), 484 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-i686/PKGBUILD 2016-02-03 18:50:51 UTC (rev 160095)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
-
-pkgname=open-iscsi
-pkgver=2.0_873
-_pkgver=${pkgver/_/-}
-pkgrel=6
-pkgdesc="userland tools"
-arch=('i686' 'x86_64')
-url="http://www.open-iscsi.org"
-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" \
- "open-iscsi.service")
-options=('docs')
-sha256sums=('7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9'
- '7b8e37dd10a909a67ba7f7126f699920639be39adfa65f1d2b2bcd8846e58db7')
-
-build() {
- cd ${srcdir}/${pkgname}-${_pkgver}
-
- # include iscsistart in the package
- sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile
-
- # build breaks if the openslp package is installed
- sed -i -e 's/\(\.\/configure\)/ \1 --without-slp/g' Makefile
-
- make user
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${_pkgver}
-
- make DESTDIR=${pkgdir} install_user
-
- install -D -m644 ${srcdir}/${pkgname}-${_pkgver}/etc/iscsid.conf ${pkgdir}/etc/iscsi
- install -D -m644 ${srcdir}/open-iscsi.service ${pkgdir}/usr/lib/systemd/system/open-iscsi.service
-
- touch ${pkgdir}/etc/iscsi/initiatorname.iscsi
-
- # copy docs
- mkdir -p ${pkgdir}/usr/share/doc/${pkgname}
- install -m644 Changelog ${pkgdir}/usr/share/doc/${pkgname}/
- install -m644 README ${pkgdir}/usr/share/doc/${pkgname}/
-
- mv $pkgdir/sbin $pkgdir/usr/bin
-}
Copied: open-iscsi/repos/community-i686/PKGBUILD (from rev 160094, open-iscsi/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-02-03 18:50:51 UTC (rev 160095)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
+
+pkgname=open-iscsi
+pkgver=2.0_873
+_pkgver=${pkgver/_/-}
+pkgrel=7
+pkgdesc="userland tools"
+arch=('i686' 'x86_64')
+url="http://www.open-iscsi.org"
+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"
+source=("http://arch.p5n.pp.ru/~sergej/dl/${pkgname}-${_pkgver}.tar.gz"
+ "open-iscsi.service")
+options=('docs')
+sha256sums=('7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9'
+ '7b8e37dd10a909a67ba7f7126f699920639be39adfa65f1d2b2bcd8846e58db7')
+
+build() {
+ cd ${srcdir}/${pkgname}-${_pkgver}
+
+ # include iscsistart in the package
+ sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile
+
+ # build breaks if the openslp package is installed
+ sed -i -e 's/\(\.\/configure\)/ \1 --without-slp/g' Makefile
+
+ make user
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${_pkgver}
+
+ make DESTDIR=${pkgdir} install_user
+
+ install -D -m644 ${srcdir}/${pkgname}-${_pkgver}/etc/iscsid.conf ${pkgdir}/etc/iscsi
+ install -D -m644 ${srcdir}/open-iscsi.service ${pkgdir}/usr/lib/systemd/system/open-iscsi.service
+
+ echo -n >${pkgdir}/etc/iscsi/initiatorname.iscsi
+
+ # copy docs
+ mkdir -p ${pkgdir}/usr/share/doc/${pkgname}
+ install -m644 Changelog ${pkgdir}/usr/share/doc/${pkgname}/
+ install -m644 README ${pkgdir}/usr/share/doc/${pkgname}/
+
+ mv $pkgdir/sbin $pkgdir/usr/bin
+}
Deleted: community-i686/open-iscsi
===================================================================
--- community-i686/open-iscsi 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-i686/open-iscsi 2016-02-03 18:50:51 UTC (rev 160095)
@@ -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: community-i686/open-iscsi.conf.d
===================================================================
--- community-i686/open-iscsi.conf.d 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-i686/open-iscsi.conf.d 2016-02-03 18:50:51 UTC (rev 160095)
@@ -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=""
Deleted: community-i686/open-iscsi.install
===================================================================
--- community-i686/open-iscsi.install 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-i686/open-iscsi.install 2016-02-03 18:50:51 UTC (rev 160095)
@@ -1,13 +0,0 @@
-## arg 1: the new package version
-post_install() {
- if [ -z $(</etc/iscsi/initiatorname.iscsi) ]; then
- name=$(iscsi-iname)
- echo
- echo ">>> Setting Initiatorname '$name'"
- echo "InitiatorName=$name" > /etc/iscsi/initiatorname.iscsi
- fi
-}
-
-post_upgrade() {
- post_install
-}
Copied: open-iscsi/repos/community-i686/open-iscsi.install (from rev 160094, open-iscsi/trunk/open-iscsi.install)
===================================================================
--- community-i686/open-iscsi.install (rev 0)
+++ community-i686/open-iscsi.install 2016-02-03 18:50:51 UTC (rev 160095)
@@ -0,0 +1,12 @@
+post_install() {
+ if [ -z $(<etc/iscsi/initiatorname.iscsi) ]; then
+ name=$(iscsi-iname)
+ echo
+ echo ">>> Setting Initiatorname '$name'"
+ echo "InitiatorName=$name" >etc/iscsi/initiatorname.iscsi
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Deleted: community-i686/open-iscsi.service
===================================================================
--- community-i686/open-iscsi.service 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-i686/open-iscsi.service 2016-02-03 18:50:51 UTC (rev 160095)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Open iSCSI Daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/sbin/iscsid
-
-[Install]
-WantedBy=multi-user.target
Copied: open-iscsi/repos/community-i686/open-iscsi.service (from rev 160094, open-iscsi/trunk/open-iscsi.service)
===================================================================
--- community-i686/open-iscsi.service (rev 0)
+++ community-i686/open-iscsi.service 2016-02-03 18:50:51 UTC (rev 160095)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Open iSCSI Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/sbin/iscsid
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-x86_64/PKGBUILD 2016-02-03 18:50:51 UTC (rev 160095)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
-
-pkgname=open-iscsi
-pkgver=2.0_873
-_pkgver=${pkgver/_/-}
-pkgrel=6
-pkgdesc="userland tools"
-arch=('i686' 'x86_64')
-url="http://www.open-iscsi.org"
-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" \
- "open-iscsi.service")
-options=('docs')
-sha256sums=('7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9'
- '7b8e37dd10a909a67ba7f7126f699920639be39adfa65f1d2b2bcd8846e58db7')
-
-build() {
- cd ${srcdir}/${pkgname}-${_pkgver}
-
- # include iscsistart in the package
- sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile
-
- # build breaks if the openslp package is installed
- sed -i -e 's/\(\.\/configure\)/ \1 --without-slp/g' Makefile
-
- make user
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${_pkgver}
-
- make DESTDIR=${pkgdir} install_user
-
- install -D -m644 ${srcdir}/${pkgname}-${_pkgver}/etc/iscsid.conf ${pkgdir}/etc/iscsi
- install -D -m644 ${srcdir}/open-iscsi.service ${pkgdir}/usr/lib/systemd/system/open-iscsi.service
-
- touch ${pkgdir}/etc/iscsi/initiatorname.iscsi
-
- # copy docs
- mkdir -p ${pkgdir}/usr/share/doc/${pkgname}
- install -m644 Changelog ${pkgdir}/usr/share/doc/${pkgname}/
- install -m644 README ${pkgdir}/usr/share/doc/${pkgname}/
-
- mv $pkgdir/sbin $pkgdir/usr/bin
-}
Copied: open-iscsi/repos/community-x86_64/PKGBUILD (from rev 160094, open-iscsi/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-02-03 18:50:51 UTC (rev 160095)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Stefan Kirrmann <stefan.kirrmann at gmail dot com>
+
+pkgname=open-iscsi
+pkgver=2.0_873
+_pkgver=${pkgver/_/-}
+pkgrel=7
+pkgdesc="userland tools"
+arch=('i686' 'x86_64')
+url="http://www.open-iscsi.org"
+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"
+source=("http://arch.p5n.pp.ru/~sergej/dl/${pkgname}-${_pkgver}.tar.gz"
+ "open-iscsi.service")
+options=('docs')
+sha256sums=('7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9'
+ '7b8e37dd10a909a67ba7f7126f699920639be39adfa65f1d2b2bcd8846e58db7')
+
+build() {
+ cd ${srcdir}/${pkgname}-${_pkgver}
+
+ # include iscsistart in the package
+ sed -i -e '/^PROGRAMS = /s/$/ usr\/iscsistart/' Makefile
+
+ # build breaks if the openslp package is installed
+ sed -i -e 's/\(\.\/configure\)/ \1 --without-slp/g' Makefile
+
+ make user
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${_pkgver}
+
+ make DESTDIR=${pkgdir} install_user
+
+ install -D -m644 ${srcdir}/${pkgname}-${_pkgver}/etc/iscsid.conf ${pkgdir}/etc/iscsi
+ install -D -m644 ${srcdir}/open-iscsi.service ${pkgdir}/usr/lib/systemd/system/open-iscsi.service
+
+ echo -n >${pkgdir}/etc/iscsi/initiatorname.iscsi
+
+ # copy docs
+ mkdir -p ${pkgdir}/usr/share/doc/${pkgname}
+ install -m644 Changelog ${pkgdir}/usr/share/doc/${pkgname}/
+ install -m644 README ${pkgdir}/usr/share/doc/${pkgname}/
+
+ mv $pkgdir/sbin $pkgdir/usr/bin
+}
Deleted: community-x86_64/open-iscsi
===================================================================
--- community-x86_64/open-iscsi 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-x86_64/open-iscsi 2016-02-03 18:50:51 UTC (rev 160095)
@@ -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: community-x86_64/open-iscsi.conf.d
===================================================================
--- community-x86_64/open-iscsi.conf.d 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-x86_64/open-iscsi.conf.d 2016-02-03 18:50:51 UTC (rev 160095)
@@ -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=""
Deleted: community-x86_64/open-iscsi.install
===================================================================
--- community-x86_64/open-iscsi.install 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-x86_64/open-iscsi.install 2016-02-03 18:50:51 UTC (rev 160095)
@@ -1,13 +0,0 @@
-## arg 1: the new package version
-post_install() {
- if [ -z $(</etc/iscsi/initiatorname.iscsi) ]; then
- name=$(iscsi-iname)
- echo
- echo ">>> Setting Initiatorname '$name'"
- echo "InitiatorName=$name" > /etc/iscsi/initiatorname.iscsi
- fi
-}
-
-post_upgrade() {
- post_install
-}
Copied: open-iscsi/repos/community-x86_64/open-iscsi.install (from rev 160094, open-iscsi/trunk/open-iscsi.install)
===================================================================
--- community-x86_64/open-iscsi.install (rev 0)
+++ community-x86_64/open-iscsi.install 2016-02-03 18:50:51 UTC (rev 160095)
@@ -0,0 +1,12 @@
+post_install() {
+ if [ -z $(<etc/iscsi/initiatorname.iscsi) ]; then
+ name=$(iscsi-iname)
+ echo
+ echo ">>> Setting Initiatorname '$name'"
+ echo "InitiatorName=$name" >etc/iscsi/initiatorname.iscsi
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Deleted: community-x86_64/open-iscsi.service
===================================================================
--- community-x86_64/open-iscsi.service 2016-02-03 18:50:32 UTC (rev 160094)
+++ community-x86_64/open-iscsi.service 2016-02-03 18:50:51 UTC (rev 160095)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Open iSCSI Daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/sbin/iscsid
-
-[Install]
-WantedBy=multi-user.target
Copied: open-iscsi/repos/community-x86_64/open-iscsi.service (from rev 160094, open-iscsi/trunk/open-iscsi.service)
===================================================================
--- community-x86_64/open-iscsi.service (rev 0)
+++ community-x86_64/open-iscsi.service 2016-02-03 18:50:51 UTC (rev 160095)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Open iSCSI Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/sbin/iscsid
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list