Author: wiget Date: Wed Feb 1 12:27:01 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- partial support for systemd in %service
---- Files affected:
packages/rpm-build-macros:
service_generator.sh (1.11 -> 1.12) , rpm-build-macros.spec (1.317 -> 1.318)
, rpm.macros (1.638 -> 1.639)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/service_generator.sh
diff -u packages/rpm-build-macros/service_generator.sh:1.11
packages/rpm-build-macros/service_generator.sh:1.12
--- packages/rpm-build-macros/service_generator.sh:1.11 Wed Jan 4 06:09:03 2012
+++ packages/rpm-build-macros/service_generator.sh Wed Feb 1 13:26:56 2012
@@ -19,7 +19,8 @@
# common part
service_body() {
cat <<-EOF
- if [ -f /var/lock/subsys/$service ]; then
+ if ! /bin/systemd_booted; then
+ if [ -f /var/lock/subsys/$service ]; then
EOF
if [ "$noop" = 1 ]; then
echo :
@@ -31,11 +32,12 @@
if [ "$quiet" != 1 ]; then
cat <<-EOF
- else
- echo 'Run "/sbin/service $service start" to start
$desc.'
+ else
+ echo 'Run "/sbin/service $service start" to
start $desc.'
EOF
fi
cat <<-EOF
+ fi
fi
EOF
}
@@ -59,8 +61,10 @@
echo 'else'
# service restart was disabled, tell them to restart it
cat <<-EOF
- if [ -f /var/lock/subsys/$service ]; then
- echo 'Run "/sbin/service $service restart" to restart
$desc.'
+ if ! /bin/systemd_booted; then
+ if [ -f /var/lock/subsys/$service ]; then
+ echo 'Run "/sbin/service $service restart" to
restart $desc.'
+ fi
fi
EOF
echo 'fi'
================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.317
packages/rpm-build-macros/rpm-build-macros.spec:1.318
--- packages/rpm-build-macros/rpm-build-macros.spec:1.317 Mon Jan 30
17:52:11 2012
+++ packages/rpm-build-macros/rpm-build-macros.spec Wed Feb 1 13:26:56 2012
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%define rpm_macros_rev 1.638
+%define rpm_macros_rev 1.639
%define find_lang_rev 1.35
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
@@ -92,6 +92,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.318 2012/02/01 12:26:56 wiget
+- partial support for systemd in %service
+
Revision 1.317 2012/01/30 16:52:11 baggins
- 1.638
- __spec_install_post_check_tmpfiles optimizations
================================================================
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/service_generator.sh?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.317&r2=1.318&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.638&r2=1.639&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
