[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit 4a234c62d84c1e989ebd535c7e18e57fb26ad881
Author: Florin Braescu <florin at lunar-linux.org>
Date: Wed, 01 Aug 2012 04:24:32 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/4a234c62d84c1e989ebd535c7e18e57fb26ad881

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  filesys/openafs/systemd.d/openafs-server.service             +1/-0     
  net/open-iscsi/systemd.d/#open-iscsi.service#                +0/-6     
  net/open-iscsi/systemd.d/open-iscsi.service                  +13/-0    
  3 files changed, 0 insertions (+), 0 deletions (-)

--- a/filesys/openafs/systemd.d/openafs-server.service
+++ b/filesys/openafs/systemd.d/openafs-server.service
@@ -3,6 +3,7 @@ Description=OpenAFS Server Service
 After=syslog.target network.target
 
 [Service]
+Type=forking
 ExecStart=/usr/sbin/bosserver
 ExecStop=/usr/bin/bos shutdown localhost -wait -localauth
 
--- a/net/open-iscsi/systemd.d/#open-iscsi.service#
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Open-iSCSI Service
-After=network.target
-Before=local-fs.target
-
-[Service]
--- /dev/null
+++ b/net/open-iscsi/systemd.d/open-iscsi.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Open-iscsi Service Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStartPre=/sbin/modprobe -a libiscsi scsi_transport_iscsi iscsi_tcp
+ExecStart=/sbin/iscsid -c /etc/iscsi/iscsid.conf -i /etc/iscsi/initiatorname.iscsi
+ExecStartPost=/sbin/iscsiadm -m node -L automatic
+ExecStopPre=/sbin/iscsiadm -m node -U all
+
+[Install]
+WantedBy=multi-user.target remote-fs.target