- rel 3; systemd support for service

Changed files:
    rc-scripts-svn.patch -> 1.19
    rc-scripts.spec -> 1.388

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
new file mode 100644 (file)
index 0000000..3481984
--- /dev/null
+++ b/rc-scripts-svn.patch
@@ -0,0 +1,46 @@
+Index: rc.d/rc.sysinit
+===================================================================
+--- rc.d/rc.sysinit    (wersja 12481)
++++ rc.d/rc.sysinit    (wersja 12485)
+@@ -570,6 +570,10 @@
+       # Load modules
+       if ! use_upstart; then
+               load_kernel_modules modules
++              for f in /etc/modules-load.d/*.conf ; do
++                      [ -r $f ] || continue
++                      load_kernel_modules ${f##/etc/}
++              done
+       fi
+ 
+       if [ -x /sbin/multipath ] && ! is_no "$DM_MULTIPATH"; then
+Index: service
+===================================================================
+--- service    (wersja 12481)
++++ service    (wersja 12485)
+@@ -85,6 +85,14 @@
+               echo "${VERSION}" >&2
+               exit 0
+               ;;
++      --ignore-dependencies)
++              export SYSTEMCTL_IGNORE_DEPENDENCIES=1
++              shift
++              ;;
++      --skip-redirect)
++              export SYSTEMCTL_SKIP_REDIRECT=1
++              shift
++              ;;
+       --upstart)
+               USE_UPSTART=yes
+               shift
+@@ -116,7 +124,10 @@
+       esac
+ done
+ 
+-if [ -x "${SERVICEDIR}/${SERVICE}" ]; then
++if [ -x /bin/systemd_booted ] && /bin/systemd_booted && /bin/systemctl status ${SERVICE}.service > /dev/null 2>&1; then
++      echo >&2 "Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service"
++      exec /bin/systemctl ${ACTION} ${SERVICE}.service ${OPTIONS}
++elif [ -x "${SERVICEDIR}/${SERVICE}" ]; then
+       exec env -i USE_UPSTART=$USE_UPSTART LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS}
+ else
+       echo "${SERVICE}: unrecognized service" >&2

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 507953e8757cc1271411d4869b25173856681761..a7d86d7a3d3de65ba55ed3298657521876b7c81b 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:       2
+Release:       3
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Source2:      rc-local.service
 Source3:       %{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
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -119,6 +120,7 @@ programcıklar içerir.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"