Accepting request 89501 from home:a_jaeger:branches:openSUSE:Factory
Rename init scripts (bnc#661401). OBS-URL: https://build.opensuse.org/request/show/89501 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=11
This commit is contained in:
committed by
Git OBS Bridge
parent
69f15689a3
commit
1de9e8696c
@@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 27 09:25:02 UTC 2011 - aj@suse.de
|
||||||
|
|
||||||
|
- Rename init scripts (bnc#661401).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jun 6 09:20:29 UTC 2011 - aj@suse.de
|
Mon Jun 6 09:20:29 UTC 2011 - aj@suse.de
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package open-iscsi (Version 2.0.870)
|
# spec file for package open-iscsi
|
||||||
#
|
#
|
||||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -26,7 +26,7 @@ Group: Productivity/Networking/Other
|
|||||||
PreReq: %fillup_prereq %insserv_prereq
|
PreReq: %fillup_prereq %insserv_prereq
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 2.0.870
|
Version: 2.0.870
|
||||||
Release: 35
|
Release: 39
|
||||||
Provides: linux-iscsi
|
Provides: linux-iscsi
|
||||||
Obsoletes: linux-iscsi
|
Obsoletes: linux-iscsi
|
||||||
%define iscsi_release 865
|
%define iscsi_release 865
|
||||||
@@ -130,7 +130,9 @@ Authors:
|
|||||||
make DESTDIR=${RPM_BUILD_ROOT} install
|
make DESTDIR=${RPM_BUILD_ROOT} install
|
||||||
make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse
|
make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse
|
||||||
install -D -m 755 %{S:11} ${RPM_BUILD_ROOT}/sbin/iscsi-gen-initiatorname
|
install -D -m 755 %{S:11} ${RPM_BUILD_ROOT}/sbin/iscsi-gen-initiatorname
|
||||||
(cd ${RPM_BUILD_ROOT}/sbin; ln -sf /etc/init.d/open-iscsi rcopen-iscsi)
|
mv ${RPM_BUILD_ROOT}/etc/init.d/boot.open-iscsi ${RPM_BUILD_ROOT}/etc/init.d/boot.iscsid-early
|
||||||
|
mv ${RPM_BUILD_ROOT}/etc/init.d/open-iscsi ${RPM_BUILD_ROOT}/etc/init.d/iscsid
|
||||||
|
(cd ${RPM_BUILD_ROOT}/sbin; ln -sf /etc/init.d/iscsid rciscsid)
|
||||||
(cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
|
(cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@@ -138,7 +140,7 @@ install -D -m 755 %{S:11} ${RPM_BUILD_ROOT}/sbin/iscsi-gen-initiatorname
|
|||||||
|
|
||||||
%post
|
%post
|
||||||
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
|
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
|
||||||
%{fillup_and_insserv -y boot.open-iscsi}
|
%{fillup_and_insserv -y boot.iscsid-early}
|
||||||
if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then
|
if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then
|
||||||
/sbin/iscsi-gen-initiatorname
|
/sbin/iscsi-gen-initiatorname
|
||||||
fi
|
fi
|
||||||
@@ -148,7 +150,7 @@ fi
|
|||||||
%{insserv_cleanup}
|
%{insserv_cleanup}
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%{stop_on_removal open-iscsi}
|
%{stop_on_removal iscsid}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@@ -157,8 +159,8 @@ fi
|
|||||||
%dir /etc/iscsi/ifaces
|
%dir /etc/iscsi/ifaces
|
||||||
%config /etc/iscsi/ifaces/iface.example
|
%config /etc/iscsi/ifaces/iface.example
|
||||||
/etc/iscsid.conf
|
/etc/iscsid.conf
|
||||||
%config /etc/init.d/open-iscsi
|
%config /etc/init.d/iscsid
|
||||||
%config /etc/init.d/boot.open-iscsi
|
%config /etc/init.d/boot.iscsid-early
|
||||||
/sbin/*
|
/sbin/*
|
||||||
%dir /lib/mkinitrd
|
%dir /lib/mkinitrd
|
||||||
%dir /lib/mkinitrd/scripts
|
%dir /lib/mkinitrd/scripts
|
||||||
|
Reference in New Issue
Block a user