Vincent Untz wrote:

Hey,

Le mercredi 15 juin 2011, à 18:57 +0200, Frederic Crozat a écrit :

...

However, I'm not sure we should directly add those direct call to systemctl in %post but instead, use some macros, similar to the one we have for sysvinit and / or update those macros to be systemd compliant : %stop_on_removal / %insserv_force_if_yast / %{fillup_only} / % restart_on_update / etc..

+1 for macros. I don't think it's worth trying to update the macros; adding new ones should work well enough -- especially as there's a new file to package anyway, so people will notice there's something to do.

systemd unit files are usually named the same as the init scripts though. So adding some code that transparently handles both the init script and systemd files should be no problem. Note that there already %service_add, %service_del_preun and %service_del_postun. So you can use those instead of %fillup_and_insserv&co to make the .spec file look more modern :-) cu Ludwig -- (o_ Ludwig Nussel //\ V_/_ http://www.suse.de/ SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

On Thursday, June 16, 2011 11:51:29 AM Pavol Rusnak wrote:

On 16/06/11 09:28, Vincent Untz wrote:

...

Le mercredi 15 juin 2011, à 18:57 +0200, Frederic Crozat a écrit :

...

However, I'm not sure we should directly add those direct call to systemctl in %post but instead, use some macros, similar to the one we have for sysvinit and / or update those macros to be systemd compliant : %stop_on_removal / %insserv_force_if_yast / %{fillup_only} / % restart_on_update / etc..

+1 for macros. I don't think it's worth trying to update the macros; adding new ones should work well enough -- especially as there's a new file to package anyway, so people will notice there's something to do.

Please, this is an opportunity to unify services packaging across all RPM distros. Please, don't screw up by introducing any new SUSE specific macros. We can talk with Fedora and Mageia at least to come up with one solution that is OK with everyone and has the highest chance of being adopted in upstream RPM.

I agree. So, let's discuss on the systemd mailing list and propose something there - or what's the best way? Andreas -- Andreas Jaeger, Program Manager openSUSE aj@{novell.com,suse.com,opensuse.org} Twitter/Identica: jaegerandi SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126 -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Le vendredi 17 juin 2011 à 10:38 +0200, Frederic Crozat a écrit :

Le jeudi 16 juin 2011 à 13:48 +0200, Andreas Jaeger a écrit :

...

On Thursday, June 16, 2011 11:51:29 AM Pavol Rusnak wrote:

...

On 16/06/11 09:28, Vincent Untz wrote:

...

Le mercredi 15 juin 2011, à 18:57 +0200, Frederic Crozat a écrit :

...

However, I'm not sure we should directly add those direct call to systemctl in %post but instead, use some macros, similar to the one we have for sysvinit and / or update those macros to be systemd compliant : %stop_on_removal / %insserv_force_if_yast / %{fillup_only} / % restart_on_update / etc..

+1 for macros. I don't think it's worth trying to update the macros; adding new ones should work well enough -- especially as there's a new file to package anyway, so people will notice there's something to do.

Please, this is an opportunity to unify services packaging across all RPM distros. Please, don't screw up by introducing any new SUSE specific macros. We can talk with Fedora and Mageia at least to come up with one solution that is OK with everyone and has the highest chance of being adopted in upstream RPM.

I agree.

So, let's discuss on the systemd mailing list and propose something there - or what's the best way?

I sent a RFC on systemd-devel mailing list yesterday, we'll see how people react.

Reaction was positive. Here is a proposal I plan to submit upstream if it is fine with people here. I've reused Michael Schröder proposal from FOSDEM 2006, adapted to systemd. For openSUSE, we could modify slightly this proposal to call % fillup_and_insserv / %stop_on_removal / %restart_on_update when package hasn't migrated to systemd (I didn't add this part to systemd proposal, since it is distro specific) and would keep compat for current users of service_add / service_del_preun / service_del_post (proposed at fosdem 2006) %service_add() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %service_add_enabled() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl enable %{1}.service >/dev/null 2>&1 || : fi %service_del_preun() if [ "$1" -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{1}.service > /dev/null 2>&1 || : /bin/systemctl stop %{1}.service > /dev/null 2>&1 || : fi %service_del_postun() /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ "$1" -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart %{1}.service >/dev/null 2>&1 || : fi Comments welcome -- Frederic Crozat SUSE -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

On Monday, June 20, 2011 15:56:37 Frederic Crozat wrote:

Le vendredi 17 juin 2011 à 10:38 +0200, Frederic Crozat a écrit :

...

Le jeudi 16 juin 2011 à 13:48 +0200, Andreas Jaeger a écrit :

...

On Thursday, June 16, 2011 11:51:29 AM Pavol Rusnak wrote:

...

On 16/06/11 09:28, Vincent Untz wrote:

...

Le mercredi 15 juin 2011, à 18:57 +0200, Frederic Crozat a écrit :

...

However, I'm not sure we should directly add those direct call to systemctl in %post but instead, use some macros, similar to the one we have for sysvinit and / or update those macros to be systemd compliant : %stop_on_removal / %insserv_force_if_yast / %{fillup_only} / % restart_on_update / etc..

+1 for macros. I don't think it's worth trying to update the macros; adding new ones should work well enough -- especially as there's a new file to package anyway, so people will notice there's something to do.

Please, this is an opportunity to unify services packaging across all RPM distros. Please, don't screw up by introducing any new SUSE specific macros. We can talk with Fedora and Mageia at least to come up with one solution that is OK with everyone and has the highest chance of being adopted in upstream RPM.

I agree.

So, let's discuss on the systemd mailing list and propose something there - or what's the best way?

I sent a RFC on systemd-devel mailing list yesterday, we'll see how people react.

Reaction was positive.

Here is a proposal I plan to submit upstream if it is fine with people here. I've reused Michael Schröder proposal from FOSDEM 2006, adapted to systemd.

For openSUSE, we could modify slightly this proposal to call % fillup_and_insserv / %stop_on_removal / %restart_on_update when package hasn't migrated to systemd (I didn't add this part to systemd proposal, since it is distro specific) and would keep compat for current users of service_add / service_del_preun / service_del_post

(proposed at fosdem 2006) %service_add() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi

%service_add_enabled() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl enable %{1}.service >/dev/null 2>&1 || : fi

%service_del_preun() if [ "$1" -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{1}.service > /dev/null 2>&1 || : /bin/systemctl stop %{1}.service > /dev/null 2>&1 || : fi

%service_del_postun() /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ "$1" -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart %{1}.service >/dev/null 2>&1 || : fi

Comments welcome

Let's add some examples. Please check whether the following is right for service demo.service: # XXX: systemd-units is the name on Fedora, should we use the same? # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units %post %service_add demo.service # Alternative: %service_add_enabled demo.service %preun %service_del_preun demo.service %postun %service_del_postun demo.service What I'm missing is the way to update so that the service is only enabled if it was enabled before. Fedora has something like the following in their files: # Package with native systemd unit file is installed for the first time %triggerun -- ypbind < 3:1.32-9 if /sbin/chkconfig --level 3 ypbind ; then /bin/systemctl --no-reload enable ypbind.service >/dev/null 2>&1 || : fi Andreas -- Andreas Jaeger, Program Manager openSUSE aj@{novell.com,suse.com,opensuse.org} Twitter/Identica: jaegerandi SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126 -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Le lundi 20 juin 2011 à 16:13 +0200, Andreas Jaeger a écrit :

Let's add some examples. Please check whether the following is right for service demo.service:

# XXX: systemd-units is the name on Fedora, should we use the same? # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units

I'm ok with this part, but we must split systemd on openSUSE to be like Fedora one (I don't have objection).

%post %service_add demo.service # Alternative: %service_add_enabled demo.service

%preun %service_del_preun demo.service

%postun %service_del_postun demo.service

What I'm missing is the way to update so that the service is only enabled if it was enabled before. Fedora has something like the following in their files:

# Package with native systemd unit file is installed for the first time %triggerun -- ypbind < 3:1.32-9 if /sbin/chkconfig --level 3 ypbind ; then /bin/systemctl --no-reload enable ypbind.service >/dev/null 2>&1 || : fi

Hmm, this part might be a too distro specific to be macro-ified : - it depends on runlevel (which might be different in distro or not relevant at all) - it depends on tool to handle sysvinit (we could call chkconfig but even this might not be on all distro or in the same path) another possibility could be to add a optional macro (this one is untested ;) %service_migrate_to_systemd(l) {-l:LEVEL="-l $1 ; shift } if /sbin/chkconfig $LEVEL %{1} ; then /bin/systemctl --no-reload enable %{1}.service >/dev/null 2>&1 || : fi usage : %triggerun -- ypbind < 3:1.32-9 %service_migration_to_systemd -l 3 ypbind -- Frederic Crozat SUSE -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

On Monday, June 20, 2011 17:05:06 Frederic Crozat wrote:

Le lundi 20 juin 2011 à 16:13 +0200, Andreas Jaeger a écrit :

...

Let's add some examples. Please check whether the following is right for service demo.service:

# XXX: systemd-units is the name on Fedora, should we use the same? # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units

I'm ok with this part, but we must split systemd on openSUSE to be like Fedora one (I don't have objection).

...

%post %service_add demo.service # Alternative: %service_add_enabled demo.service

%preun %service_del_preun demo.service

%postun %service_del_postun demo.service

What I'm missing is the way to update so that the service is only enabled if it was enabled before. Fedora has something like the following in their files:

# Package with native systemd unit file is installed for the first time %triggerun -- ypbind < 3:1.32-9 if /sbin/chkconfig --level 3 ypbind ; then

/bin/systemctl --no-reload enable ypbind.service >/dev/null 2>&1 || : fi

Hmm, this part might be a too distro specific to be macro-ified : - it depends on runlevel (which might be different in distro or not relevant at all) - it depends on tool to handle sysvinit (we could call chkconfig but even this might not be on all distro or in the same path)

We need a solution for SUSE for this ;) - and the version number for sure is distro specific.

another possibility could be to add a optional macro (this one is untested ;)

%service_migrate_to_systemd(l) {-l:LEVEL="-l $1 ; shift } if /sbin/chkconfig $LEVEL %{1} ; then /bin/systemctl --no-reload enable %{1}.service >/dev/null 2>&1 || : fi

usage : %triggerun -- ypbind < 3:1.32-9 %service_migration_to_systemd -l 3 ypbind

Fine with me as well, Andreas -- Andreas Jaeger, Program Manager openSUSE aj@{novell.com,suse.com,opensuse.org} Twitter/Identica: jaegerandi SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126 -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Le lundi 20 juin 2011 à 17:35 +0200, Frederic Crozat a écrit :

Le lundi 20 juin 2011 à 17:07 +0200, Ludwig Nussel a écrit :

...

Frederic Crozat wrote:

...

[...] Here is a proposal I plan to submit upstream if it is fine with people here. I've reused Michael Schröder proposal from FOSDEM 2006, adapted to systemd.

For openSUSE, we could modify slightly this proposal to call % fillup_and_insserv / %stop_on_removal / %restart_on_update when package hasn't migrated to systemd (I didn't add this part to systemd proposal, since it is distro specific) and would keep compat for current users of service_add / service_del_preun / service_del_post

(proposed at fosdem 2006) %service_add() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi

%service_add_enabled() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl enable %{1}.service >/dev/null 2>&1 || : fi

There are some packages that directly package the symlink in e.g. multi-user.target.wants. I suppose that shouldn't be done in favor of the macro then?

Good question. I guess this should be discussed with upstream folks.

I can see one big issue, mostly in migration : systemctl enable (or disable) only works if systemd is running. So, if you are installing a package which tries to enable a .service and if systemd isn't running (old init or upgrade for 11.4), systemctl won't do anything :( -- Frederic Crozat SUSE -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Hello, on Montag, 20. Juni 2011, Andreas Jaeger wrote:

On Monday, June 20, 2011 15:56:37 Frederic Crozat wrote:

...

For openSUSE, we could modify slightly this proposal to call % fillup_and_insserv / %stop_on_removal / %restart_on_update when package hasn't migrated to systemd (I didn't add this part to systemd proposal, since it is distro specific) and would keep compat for current users of service_add / service_del_preun / service_del_post

I assume there are more distributions that haven't migrated to systemd completely - why not make these calls (optional) part of the proposal?

Let's add some examples. Please check whether the following is right for service demo.service:

# XXX: systemd-units is the name on Fedora, should we use the same? # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units

This is crying for a %systemd_requires macro ;-) (if possible, it should be defined in a base package so that we don't need an additional "BuildRequires" to have the macro available - perl-macros / %{perl_requires} can serve as bad example regarding this detail)

What I'm missing is the way to update so that the service is only enabled if it was enabled before. Fedora has something like the following in their files:

# Package with native systemd unit file is installed for the first time %triggerun -- ypbind < 3:1.32-9 if /sbin/chkconfig --level 3 ypbind ; then /bin/systemctl --no-reload enable ypbind.service >/dev/null 2>&1 || : fi

This should also be a macro. Frederic: Especially the fact that there _are_ different runlevels and tools to handle sysvinit is a good reason to have a macro, even if every distro might have to write their own macro The important point is to have a %service_migrate_to_systemd macro that you can use in the specfile for all distributions and that does the job. In other words: specfile writers should not need to know/care about the technical details behind the macro. Regards, Christian Boltz -- Fragen Sie im Zweifel sofort nach dem Absenden telefonisch beim Empfänger nach, ob Ihre E-Mail angekommen ist. Bei Schwierigkeiten wenden Sie sich bitte grundsätzlich nie an den eigenen Administrator. Es ist stets das gegnerische Mailsystem schuld. [Peer Heinlein in postfixbuch-users] -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Am Dienstag, 21. Juni 2011 schrieb Christian Boltz:

This is crying for a %systemd_requires macro ;-) (if possible, it should be defined in a base package so that we don't need an additional "BuildRequires" to have the macro available - perl-macros / %{perl_requires} can serve as bad example regarding this detail)

perl-macros is only for backports. Greetings, Stephan -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Le lundi 20 juin 2011 à 18:47 +0200, Frederic Crozat a écrit :

Le lundi 20 juin 2011 à 17:35 +0200, Frederic Crozat a écrit :

...

Le lundi 20 juin 2011 à 17:07 +0200, Ludwig Nussel a écrit :

...

Frederic Crozat wrote:

...

[...] Here is a proposal I plan to submit upstream if it is fine with people here. I've reused Michael Schröder proposal from FOSDEM 2006, adapted to systemd.

For openSUSE, we could modify slightly this proposal to call % fillup_and_insserv / %stop_on_removal / %restart_on_update when package hasn't migrated to systemd (I didn't add this part to systemd proposal, since it is distro specific) and would keep compat for current users of service_add / service_del_preun / service_del_post

(proposed at fosdem 2006) %service_add() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi

%service_add_enabled() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl enable %{1}.service >/dev/null 2>&1 || : fi

There are some packages that directly package the symlink in e.g. multi-user.target.wants. I suppose that shouldn't be done in favor of the macro then?

Good question. I guess this should be discussed with upstream folks.

I can see one big issue, mostly in migration : systemctl enable (or disable) only works if systemd is running. So, if you are installing a package which tries to enable a .service and if systemd isn't running (old init or upgrade for 11.4), systemctl won't do anything :(

I retract that statement : I've checked systemctl code : "enable" and "disable" do NOT require bus connection to systemd. Moreover, if systemctl is running in a chroot, it won't do anything too. (and after tests, I confirm it works as expected ;) So, we can keep systemctl enable / disable in the macro (and it seems more "clean" than using ln -s, since it is an implementation detail). -- Frederic Crozat SUSE -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Hello, on Dienstag, 21. Juni 2011, Frederic Crozat wrote:

Le mardi 21 juin 2011 à 13:42 +0200, Christian Boltz a écrit :

...

This is crying for a %systemd_requires macro ;-)

Indeed ;)

%systemd_requires Requires(post): systemd-units \ Requires(preun): systemd-units \ Requires(postun): systemd-units

(the content of this macro could be distro specific, if other rpm distro don't want to use systemd-units as package name for the one containing systemctl

Is there a special reason why you tend to make it different again? ;-) All distributions should just standardize on a common package name (or Provides:) for systemctl and then use one common macro. I'd propose "Provides: systemd-systemctl" or just "Provides: systemctl". Regards, Christian Boltz -- Du kannst dir einen Kernel so geschwaetzig eingestellt kompilieren, dass die HDD kaum noch mit dem loggen hinterherkommt (was wiederum Bugs im HDD-Treiber ausloesen koennte ;)) [David Haller in suse-linux] -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Christian Boltz wrote:

on Montag, 20. Juni 2011, Andreas Jaeger wrote:

...

# XXX: systemd-units is the name on Fedora, should we use the same? # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units

This is crying for a %systemd_requires macro ;-)

Can't this be solved by the automatic dependency generators of rpm 4.9 so packages don't have to care at all? cu Ludwig -- (o_ Ludwig Nussel //\ V_/_ http://www.suse.de/ SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Le mercredi 22 juin 2011 à 10:17 +0200, Ludwig Nussel a écrit :

Christian Boltz wrote:

...

on Montag, 20. Juni 2011, Andreas Jaeger wrote:

...

# XXX: systemd-units is the name on Fedora, should we use the same? # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units

This is crying for a %systemd_requires macro ;-)

Can't this be solved by the automatic dependency generators of rpm 4.9 so packages don't have to care at all?

I'd say it is an implementation detail and I'd prefer to avoid a hard dependency on rpm 4.9 in the proposal (but if we can use rpm 4.9 feature to handle %systemd_requires, why not ;) -- Frederic Crozat SUSE -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Le lundi 20 juin 2011 à 16:19 +0200, Yamaban a écrit :

On Mon, 20 Jun 2011 15:56, Frederic Crozat wrote:

...

Le vendredi 17 juin 2011 à 10:38 +0200, Frederic Crozat a écrit :

...

Le jeudi 16 juin 2011 à 13:48 +0200, Andreas Jaeger a écrit :

...

On Thursday, June 16, 2011 11:51:29 AM Pavol Rusnak wrote:

...

On 16/06/11 09:28, Vincent Untz wrote:

...

Le mercredi 15 juin 2011, à 18:57 +0200, Frederic Crozat a écrit : > However, I'm not sure we should directly add those direct call to > systemctl in %post but instead, use some macros, similar to the one we > have for sysvinit and / or update those macros to be systemd compliant : > %stop_on_removal / %insserv_force_if_yast / %{fillup_only} / % > restart_on_update / etc..

+1 for macros. I don't think it's worth trying to update the macros; adding new ones should work well enough -- especially as there's a new file to package anyway, so people will notice there's something to do.

Please, this is an opportunity to unify services packaging across all RPM distros. Please, don't screw up by introducing any new SUSE specific macros. We can talk with Fedora and Mageia at least to come up with one solution that is OK with everyone and has the highest chance of being adopted in upstream RPM.

I agree.

So, let's discuss on the systemd mailing list and propose something there - or what's the best way?

I sent a RFC on systemd-devel mailing list yesterday, we'll see how people react.

Reaction was positive.

Here is a proposal I plan to submit upstream if it is fine with people here. I've reused Michael Schröder proposal from FOSDEM 2006, adapted to systemd.

For openSUSE, we could modify slightly this proposal to call % fillup_and_insserv / %stop_on_removal / %restart_on_update when package hasn't migrated to systemd (I didn't add this part to systemd proposal, since it is distro specific) and would keep compat for current users of service_add / service_del_preun / service_del_post

(proposed at fosdem 2006) %service_add() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi

%service_add_enabled() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl enable %{1}.service >/dev/null 2>&1 || : fi

%service_del_preun() if [ "$1" -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{1}.service > /dev/null 2>&1 || : /bin/systemctl stop %{1}.service > /dev/null 2>&1 || : fi

%service_del_postun() /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ "$1" -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart %{1}.service >/dev/null 2>&1 || : fi

Comments welcome

Added Idea esp. for Distros which use their own macros: Would it be possible to provide these macros system/distro independent? As smallest common denominator?

The idea is to get those macro either shipped with systemd or in rpm upstream. -- Frederic Crozat SUSE -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Hello, on Mittwoch, 22. Juni 2011, Frederic Crozat wrote:

Here is a new version of the proposal, based on our feedback : ... %service_add_enabled() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl enable %{1}.service >/dev/null 2>&1 || : fi ... usage :

%post %service_add demo.service

This looks buggy ;-) Your macros all contain %{1}.service - therefore calling them with *.service as parameter will double it. The question is what is better: a) remove the .service when calling the macro (that saves packagers some keystrokes) b) remove the .service in the macros (that makes them more flexible - IIRC systemd also supports things like *.socket etc.) You know systemd much better than I do, therefore I'll let the decision up to you. Regards, Christian Boltz --

Ich habe immer so Bißspuren in meiner Tastatur! Weiß jemand wieso? Ist Deine Maus hungrig? [> Bernd Brodesser und Hannes Vogelmann in suse-linux] -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Here is new version of the proposal I sent to systemd-devel some minutes ago. The big change is dropping %service_add_enabled : systemd folks doesn't want to hardcode policy for a service as part of packagings and would prefer some separate files to handle that (see http://lists.freedesktop.org/archives/systemd-devel/2011-June/002755.html and http://lists.freedesktop.org/archives/systemd-devel/2011-July/002801.html ). Until this happens, I suggest we use "/bin/systemctl enable foobar.service >/dev/null 2>&1 || :" in specfiles. Other changess : -%service_* macros are expecting full unit name (sshd.service, foobar.socket) -%service_* macros accept several units files as parameters (the various macros could be modified by distro if they also want to support sysvinit service with the same macro, but it is outside the scope of this initial proposal) %service_add() if [ "$1" -eq 1 ] ; then # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %service_del_preun() if [ "$1" -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : /bin/systemctl stop %{?*} > /dev/null 2>&1 || : fi %service_del_postun() /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ "$1" -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart %{1} >/dev/null 2>&1 || : fi (this macro could refer to different package, if people don't agree on systemd-units as packagename) %define systemd_requires() # This is for /bin/systemctl Requires(post): systemd-units \ Requires(preun): systemd-units \ Requires(postun): systemd-units \ %service_migrate_to_systemd(l) {-l:LEVEL="-l $1 ; shift } for service in %{?*} ; do \ if /sbin/chkconfig $LEVEL $service ; then /bin/systemctl --no-reload enable `echo $service | sed -e 's/\.service//g'` >/dev/null 2>&1 || : fi usage : %post %service_add demo.service foobar.socket %preun %service_del_preun demo.service %postun %service_del_postun demo.service when migrating a package from sysvinit to systemd : %triggerun -- package_name < version_where_switch_occured %service_migration_to_systemd [ -l run_level ] service_name.service foobar.socket -l is optional -- Frederic Crozat SUSE -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org

Frederic Crozat wrote:

And here is a change, for handling sysvinit to systemd migration, without relying on triggers : [...] And usage is like this : %pre %service_migrate_to_systemd_pre foobar

%post %service_migrate_to_systemd_post foobar %service_add foobar.service

%preun %service_del_preun foobar.service

%postun %service_migrate_to_systemd_postun foobar %service_del_postun foobar.service

Comments welcome (you can use package home:fcrozat:systemd:systemd which contains the changes).

What about integrating %service_migrate_to_systemd_post into %service_add and just do it automatically? Same for %service_migrate_to_systemd_postun. %service_migrate_to_systemd_pre could be renamed to a more generic %service_add_pre then which would allow us to hook in other things in the future if needed. cu Ludwig -- (o_ Ludwig Nussel //\ V_/_ http://www.suse.de/ SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org