From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 16 Mar 2012 18:40:45 +0000 (+0000)
Subject: - rel 6
X-Git-Tag: auto/th/rc-scripts-0_4_5_3-6
X-Git-Url: https://git.pld-linux.org/?p=packages%2Frc-scripts.git;a=commitdiff_plain;h=5016daa28aa4d80d4c941933dc33a185ad7d65cf

- rel 6
- add sys-chroots compatibility service for systemd

Changed files:
    rc-scripts.spec -> 1.391
    sys-chroots.service -> 1.1
---

diff --git a/rc-scripts.spec b/rc-scripts.spec
index f0fd1ce..7761da8 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):	inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.5.3
-Release:	5
+Release:	6
 License:	GPL v2
 Group:		Base
 #Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -17,7 +17,8 @@ Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	ac04b9e70d2bb1583f5ea41dd2d1894e
 Source1:	rc-scripts-systemd-tmpfiles.d.conf
 Source2:	rc-local.service
-Source3:	%{name}.tmpfiles
+Source3:	sys-chroots.service
+Source4:	%{name}.tmpfiles
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 Patch0:		%{name}-skip_networkmanager_users_config.patch
 Patch1:		%{name}-svn.patch
@@ -192,7 +193,8 @@ ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 # systemd
 install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/rc-scripts.conf
 install -D %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/local.service
-install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install -D %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/sys-chroots.service
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %if "%{pld_release}" == "ac"
 rm -rf $RPM_BUILD_ROOT/etc/init
@@ -317,6 +319,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 
 /usr/lib/tmpfiles.d/rc-scripts.conf
 /lib/systemd/system/local.service
+/lib/systemd/system/sys-chroots.service
 
 %dir /lib/rc-scripts
 %attr(755,root,root) /lib/rc-scripts/ifdown-br
diff --git a/sys-chroots.service b/sys-chroots.service
new file mode 100644
index 0000000..9ea1c15
--- /dev/null
+++ b/sys-chroots.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=/etc/rc.d/init.d/sys-chroots Compatibility
+After=network.target local-fs.target remote-fs.target
+
+[Service]
+Type=forking
+ExecStart=/etc/rc.d/init.d/sys-chroots start
+ExecStop=/etc/rc.d/init.d/sys-chroots stop
+TimeoutSec=0
+StandardOutput=tty
+RemainAfterExit=yes
+SysVStartPriority=99