rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

Accepting request 817028 from home:gmbr3:branches:Base:System3

Browse Source 
- Fixes for %_libexecdir changing to /usr/libexec

OBS-URL: https://build.opensuse.org/request/show/817028
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=211
This commit is contained in:
Reinhard Max 2020-06-25 10:27:29 +00:00 committed by Git OBS Bridge
parent ed443ff263
commit 07538a3393
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dhcp.changes
View File

@ -3,6 +3,11 @@ Tue Jun 23 15:22:00 UTC 2020 - Cristian Rodríguez <crrodriguez@opensuse.org>
- insserv is not required anymore
-------------------------------------------------------------------
Thu Jun 11 15:46:50 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec
-------------------------------------------------------------------
Wed Apr 15 06:32:20 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>

1
dhcp.spec
View File

@ -321,6 +321,7 @@ install -m0644 $RPM_SOURCE_DIR/dhcrelay.service \
%{buildroot}%{_unitdir}/dhcrelay.service
install -m0644 $RPM_SOURCE_DIR/dhcrelay6.service \
%{buildroot}%{_unitdir}/dhcrelay6.service
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{buildroot}%{_unitdir}/d*
# rcservice links
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd6

4
dhcpd.service
View File

@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target slapd.s
[Service]
Type=forking
Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcpd -4 start
ExecStop=/usr/lib/dhcp/dhcpd -4 stop
ExecStart=@LIBEXECDIR@/dhcp/dhcpd -4 start
ExecStop=@LIBEXECDIR@/dhcp/dhcpd -4 stop
[Install]
WantedBy=multi-user.target

4
dhcpd6.service
View File

@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target slapd.s
[Service]
Type=forking
Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcpd -6 start
ExecStop=/usr/lib/dhcp/dhcpd -6 stop
ExecStart=@LIBEXECDIR@/dhcp/dhcpd -6 start
ExecStop=@LIBEXECDIR@/dhcp/dhcpd -6 stop
[Install]
WantedBy=multi-user.target

4
dhcrelay.service
View File

@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target ldap.se
[Service]
Type=forking
Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcrelay -4 start
ExecStop=/usr/lib/dhcp/dhcrelay -4 stop
ExecStart=@LIBEXECDIR@/dhcp/dhcrelay -4 start
ExecStop=@LIBEXECDIR@/dhcp/dhcrelay -4 stop
PIDFile=/var/run/dhcrelay.pid
[Install]

4
dhcrelay6.service
View File

@ -6,8 +6,8 @@ After=remote-fs.target network.target nss-lookup.target time-sync.target ldap.se
[Service]
Type=forking
Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcrelay -6 start
ExecStop=/usr/lib/dhcp/dhcrelay -6 stop
ExecStart=@LIBEXECDIR@/dhcp/dhcrelay -6 start
ExecStop=@LIBEXECDIR@/dhcp/dhcrelay -6 stop
[Install]
WantedBy=multi-user.target