From 606ae7d18503eb8d92b3af0cb21059b6ba0594ee Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sun, 13 Mar 2011 19:02:58 +0000 Subject: add full systemd support for new as well as migrated packages --- rpm-helper.macros.in | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'rpm-helper.macros.in') diff --git a/rpm-helper.macros.in b/rpm-helper.macros.in index 8d0859a..813b65b 100644 --- a/rpm-helper.macros.in +++ b/rpm-helper.macros.in @@ -15,11 +15,11 @@ # initscripts macros %_add_service_helper %_rpm_helper_dir/add-service -%_post_service() %_add_service_helper %{name} $1 %{1} \ +%_post_service() %_add_service_helper %{name} $1 %{*} \ %{nil} %_del_service_helper %_rpm_helper_dir/del-service -%_preun_service() %_del_service_helper %{name} $1 %{1} \ +%_preun_service() %_del_service_helper %{name} $1 %{*} \ %{nil} %_add_user_helper %_rpm_helper_dir/add-user @@ -66,8 +66,18 @@ %{nil} # systemd support -%_systemd_migrate_service() \ -if [ -x /bin/systemctl ] && /sbin/chkconfig --no-redirect --level=3 %{1}; then \ - /bin/systemctl --quiet enable %{1}.service \ -fi \ +%_migrate_service_helper %_rpm_helper_dir/migrate-service +%_systemd_migrate_service_pre() %_migrate_service_helper pre %{*} \ +%{nil} +%_systemd_migrate_service_post() %_migrate_service_helper post %{*} \ +%{nil} + +%_post_unit() %_add_service_helper --no-sysv %{name} $1 %{*} \ +%{nil} + +%_preun_unit() %_del_service_helper --no-sysv %{name} $1 %{*} \ +%{nil} + +%_postun_unit_helper %_rpm_helper_dir/postun-unit +%_postun_unit() %_postun_unit_helper %{name} $1 %{*} \ %{nil} -- cgit v1.2.1