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

Accepting request 817030 from network:dhcp

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/817030
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=119
This commit is contained in:
Dominique Leuenberger 2020-06-26 19:46:33 +00:00 committed by Git OBS Bridge
commit 77100858ba
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dhcp.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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> Wed Apr 15 06:32:20 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>

6
dhcp.spec
View File

@ -101,11 +101,6 @@ BuildRequires: sysuser-tools
%package server %package server
Summary: ISC DHCP Server Summary: ISC DHCP Server
Group: Productivity/Networking/Boot/Servers Group: Productivity/Networking/Boot/Servers
%if 0%{?suse_version} > 1500
# Workaround: require insserv-compat, until this package is
# converted to be shipping proper systemd units (boo#1133632)
Requires: insserv-compat
%endif
Requires: dhcp = %{version} Requires: dhcp = %{version}
%if 0%{?suse_version} < 1500 %if 0%{?suse_version} < 1500
Requires: net-tools Requires: net-tools
@ -326,6 +321,7 @@ install -m0644 $RPM_SOURCE_DIR/dhcrelay.service \
%{buildroot}%{_unitdir}/dhcrelay.service %{buildroot}%{_unitdir}/dhcrelay.service
install -m0644 $RPM_SOURCE_DIR/dhcrelay6.service \ install -m0644 $RPM_SOURCE_DIR/dhcrelay6.service \
%{buildroot}%{_unitdir}/dhcrelay6.service %{buildroot}%{_unitdir}/dhcrelay6.service
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{buildroot}%{_unitdir}/d*
# rcservice links # rcservice links
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcdhcpd6 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] [Service]
Type=forking Type=forking
Restart=on-abort Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcpd -4 start ExecStart=@LIBEXECDIR@/dhcp/dhcpd -4 start
ExecStop=/usr/lib/dhcp/dhcpd -4 stop ExecStop=@LIBEXECDIR@/dhcp/dhcpd -4 stop
[Install] [Install]
WantedBy=multi-user.target 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] [Service]
Type=forking Type=forking
Restart=on-abort Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcpd -6 start ExecStart=@LIBEXECDIR@/dhcp/dhcpd -6 start
ExecStop=/usr/lib/dhcp/dhcpd -6 stop ExecStop=@LIBEXECDIR@/dhcp/dhcpd -6 stop
[Install] [Install]
WantedBy=multi-user.target 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] [Service]
Type=forking Type=forking
Restart=on-abort Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcrelay -4 start ExecStart=@LIBEXECDIR@/dhcp/dhcrelay -4 start
ExecStop=/usr/lib/dhcp/dhcrelay -4 stop ExecStop=@LIBEXECDIR@/dhcp/dhcrelay -4 stop
PIDFile=/var/run/dhcrelay.pid PIDFile=/var/run/dhcrelay.pid
[Install] [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] [Service]
Type=forking Type=forking
Restart=on-abort Restart=on-abort
ExecStart=/usr/lib/dhcp/dhcrelay -6 start ExecStart=@LIBEXECDIR@/dhcp/dhcrelay -6 start
ExecStop=/usr/lib/dhcp/dhcrelay -6 stop ExecStop=@LIBEXECDIR@/dhcp/dhcrelay -6 stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target