pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 236543 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/236543
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=225
This commit is contained in:
Stephan Kulow 2014-06-18 20:04:35 +00:00 committed by Git OBS Bridge
commit 321912a2de
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpm-suse_macros
View File

@ -31,7 +31,7 @@
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then \ if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then \
test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || : \ test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || : \
for service in %{?*} ; do \ for service in %{?*} ; do \
/etc/init.d/$service try-restart > /dev/null || : \ test -x /bin/systemctl && /bin/systemctl try-restart $service >/dev/null 2>&1 || : \
done \ done \
fi \ fi \
fi \ fi \
@ -46,7 +46,7 @@
test -f /etc/sysconfig/services && . /etc/sysconfig/services \ test -f /etc/sysconfig/services && . /etc/sysconfig/services \
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_STOP_ON_REMOVAL" != yes ; then \ if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_STOP_ON_REMOVAL" != yes ; then \
for service in %{?*} ; do \ for service in %{?*} ; do \
/etc/init.d/$service stop > /dev/null \ test -x /bin/systemctl && /bin/systemctl stop $service >/dev/null 2>&1 || : \
done \ done \
fi \ fi \
fi \ fi \

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 22 16:40:35 CEST 2014 - mls@suse.de
- adapt restart_on_update and stop_on_removal to use
systemctl [bnc#878255]
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 9 13:33:09 CEST 2014 - mls@suse.de Fri May 9 13:33:09 CEST 2014 - mls@suse.de