packages: rc-scripts/rc-scripts.spec, rc-scripts/rc-scripts-svn.patch - rel...
arekm
arekm at pld-linux.org
Sun Mar 4 21:50:42 CET 2012
Author: arekm Date: Sun Mar 4 20:50:42 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; systemd support for service
---- Files affected:
packages/rc-scripts:
rc-scripts.spec (1.387 -> 1.388) , rc-scripts-svn.patch (1.18 -> 1.19)
---- Diffs:
================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.387 packages/rc-scripts/rc-scripts.spec:1.388
--- packages/rc-scripts/rc-scripts.spec:1.387 Sun Feb 19 23:16:29 2012
+++ packages/rc-scripts/rc-scripts.spec Sun Mar 4 21:50:37 2012
@@ -10,7 +10,7 @@
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
@@ -21,6 +21,7 @@
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
@@ -120,6 +121,7 @@
%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"
@@ -396,6 +398,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.388 2012/03/04 20:50:37 arekm
+- rel 3; systemd support for service
+
Revision 1.387 2012/02/19 22:16:29 baggins
- rel 2
- new and improved glib2 static linking hack
================================================================
Index: packages/rc-scripts/rc-scripts-svn.patch
diff -u /dev/null packages/rc-scripts/rc-scripts-svn.patch:1.19
--- /dev/null Sun Mar 4 21:50:42 2012
+++ packages/rc-scripts/rc-scripts-svn.patch Sun Mar 4 21:50:37 2012
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.387&r2=1.388&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts-svn.patch?r1=1.18&r2=1.19&f=u
More information about the pld-cvs-commit
mailing list