Re: [PATCH] systemd/*: Use @SBINDIR@.

[Bernd Zeimetz]

On 8/3/20 11:29 AM, Ladislav Michl wrote:

> +    ('@SBINDIR@',    installdir('sbindir', add_destdir=False)),

looking at the other options this seems to be correct.


> --- a/systemd/gpsd.service
> +++ b/systemd/gpsd.service.in
> @@ -8,7 +8,7 @@ After=chronyd.service
>  Type=forking
>  EnvironmentFile=-/etc/default/gpsd
>  EnvironmentFile=-/etc/sysconfig/gpsd
> -ExecStart=/usr/local/sbin/gpsd $GPSD_OPTIONS $OPTIONS $DEVICES
> +ExecStart=@SBINDIR@/gpsd $GPSD_OPTIONS $OPTIONS $DEVICES

Thats correct!

>  [Install]
>  WantedBy=multi-user.target
> diff --git a/systemd/gpsdctl@.service.in b/systemd/gpsdctl@.service.in
> index c09fc19f9..dd8d3cb89 100644
> --- a/systemd/gpsdctl@.service.in
> +++ b/systemd/gpsdctl@.service.in
> @@ -10,5 +10,5 @@ Environment="GPSD_SOCKET=@RUNDIR@/gpsd.sock"
>  EnvironmentFile=-/etc/default/gpsd
>  EnvironmentFile=-/etc/sysconfig/gpsd
>  RemainAfterExit=yes
> -ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/local/sbin/gpsdctl add 
> /dev/%I || :"
> -ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/local/sbin/gpsdctl 
> remove /dev/%I || :"
> +ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && @SBINDIR@/gpsdctl add 
> /dev/%I || :"
> +ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && @SBINDIR@/gpsdctl remove 
> /dev/%I || :"

Thats also correct.

One thing less to patch with this patch applied.


-- 
 Bernd Zeimetz                            Debian GNU/Linux Developer
 http://bzed.de                                http://www.debian.org
 GPG Fingerprint: ECA1 E3F2 8E11 2432 D485  DD95 EB36 171A 6FF9 435F