- rel 4

- fixed rc-local.service:
	- change name to properly cover rc-scripts SysV service
	- run proper script in execstart
	- require at least network and all filesystems

Changed files:
    rc-local.service -> 1.2
    rc-scripts.spec -> 1.389

diff --git a/rc-local.service b/rc-local.service
index c116829dee18961d7f15bf623889e4b152c5ce14..abd8225d84e44435a5fc3cc81d3da3cf4d1e9e64 100644 (file)
--- a/rc-local.service
+++ b/rc-local.service
@@ -7,11 +7,11 @@
 
 [Unit]
 Description=/etc/rc.d/rc.local Compatibility
-ConditionFileIsExecutable=/etc/rc.d/rc.local
+After=network.target local-fs.target remote-fs.target
 
 [Service]
 Type=forking
-ExecStart=/etc/rc.d/rc.local start
+ExecStart=/etc/rc.d/init.d/local start
 TimeoutSec=0
 StandardOutput=tty
 RemainAfterExit=yes

diff --git a/rc-scripts.spec b/rc-scripts.spec
index a7d86d7a3d3de65ba55ed3298657521876b7c81b..326f9da315557098382ec9246ab9381ce125d5cb 100644 (file)
--- 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:       3
+Release:       4
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -191,7 +191,7 @@ 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/rc-local.service
+install -D %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/local.service
 install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %if "%{pld_release}" == "ac"
@@ -316,7 +316,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
 
 /usr/lib/tmpfiles.d/rc-scripts.conf
-/lib/systemd/system/rc-local.service
+/lib/systemd/system/local.service
 
 %dir /lib/rc-scripts
 %attr(755,root,root) /lib/rc-scripts/ifdown-br