Accepting request 557307 from network:dhcp
OBS-URL: https://build.opensuse.org/request/show/557307 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=105
This commit is contained in:
commit
ecd4f4cbd0
26
dhcp.changes
26
dhcp.changes
@ -1,3 +1,29 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 13 15:52:25 UTC 2017 - mchandras@suse.de
|
||||||
|
|
||||||
|
- Drop old sysvinit support from the spec file. All the supported
|
||||||
|
openSUSE distributions are systemd based so there isn't much point
|
||||||
|
in keeping sysvinit support and files around.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 23 13:49:18 UTC 2017 - rbrown@suse.com
|
||||||
|
|
||||||
|
- Replace references to /var/adm/fillup-templates with new
|
||||||
|
%_fillupdir macro (boo#1069468)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 14 09:48:25 UTC 2017 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Replace net-tools Requires in dhcp-client with hostname on
|
||||||
|
suse_version >= 1330 (CODE15): net-tools does no longer provide
|
||||||
|
any tool referenced by dhclient-script, but we require hostname
|
||||||
|
(which is also a dependency to net-tools, thus hiding the issue).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 13 12:27:59 UTC 2017 - bwiedemann@suse.com
|
||||||
|
|
||||||
|
- use .gz year instead of current one to make build reproducible
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 6 16:17:18 CEST 2017 - ndas@suse.de
|
Thu Jul 6 16:17:18 CEST 2017 - ndas@suse.de
|
||||||
|
|
||||||
|
131
dhcp.spec
131
dhcp.spec
@ -16,6 +16,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||||
|
%if ! %{defined _fillupdir}
|
||||||
|
%define _fillupdir /var/adm/fillup-templates
|
||||||
|
%endif
|
||||||
|
|
||||||
%define isc_version 4.3.5
|
%define isc_version 4.3.5
|
||||||
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
|
||||||
%define omc_prefix /usr/share/omc
|
%define omc_prefix /usr/share/omc
|
||||||
@ -26,11 +31,6 @@
|
|||||||
%define with_ldapcasa 0%{?sles_version} >= 10 || (%suse_version >= 1110 && %suse_version < 1140)
|
%define with_ldapcasa 0%{?sles_version} >= 10 || (%suse_version >= 1110 && %suse_version < 1140)
|
||||||
# doc package is new on 11.3
|
# doc package is new on 11.3
|
||||||
%define with_doc_package %suse_version >= 1130
|
%define with_doc_package %suse_version >= 1130
|
||||||
%if 0%{?suse_version} >= 1310
|
|
||||||
%bcond_without systemd
|
|
||||||
%else
|
|
||||||
%bcond_with systemd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: dhcp
|
Name: dhcp
|
||||||
%if %{with_ldap}
|
%if %{with_ldap}
|
||||||
@ -53,17 +53,10 @@ Source2: %{name}.keyring
|
|||||||
#
|
#
|
||||||
Source10: dhcpd.script
|
Source10: dhcpd.script
|
||||||
Source11: dhcrelay.script
|
Source11: dhcrelay.script
|
||||||
%if %{with systemd}
|
|
||||||
Source12: dhcpd.service
|
Source12: dhcpd.service
|
||||||
Source13: dhcpd6.service
|
Source13: dhcpd6.service
|
||||||
Source14: dhcrelay.service
|
Source14: dhcrelay.service
|
||||||
Source15: dhcrelay6.service
|
Source15: dhcrelay6.service
|
||||||
%else
|
|
||||||
Source12: rc.dhcpd
|
|
||||||
Source13: rc.dhcpd6
|
|
||||||
Source14: rc.dhcrelay
|
|
||||||
Source15: rc.dhcrelay6
|
|
||||||
%endif
|
|
||||||
Source17: sysconfig.dhcpd
|
Source17: sysconfig.dhcpd
|
||||||
Source18: sysconfig.dhcrelay
|
Source18: sysconfig.dhcrelay
|
||||||
Source19: if-up.d.dhcpd-restart-hook
|
Source19: if-up.d.dhcpd-restart-hook
|
||||||
@ -130,9 +123,6 @@ Summary: ISC DHCP Server
|
|||||||
Group: Productivity/Networking/Boot/Servers
|
Group: Productivity/Networking/Boot/Servers
|
||||||
Requires: dhcp = %{version}
|
Requires: dhcp = %{version}
|
||||||
Requires: net-tools
|
Requires: net-tools
|
||||||
%if !%{with systemd}
|
|
||||||
PreReq: %insserv_prereq
|
|
||||||
%endif
|
|
||||||
PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
|
PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
|
||||||
|
|
||||||
%package client
|
%package client
|
||||||
@ -141,18 +131,19 @@ Group: Productivity/Networking/Boot/Clients
|
|||||||
Requires: /usr/bin/host
|
Requires: /usr/bin/host
|
||||||
Requires: /usr/bin/touch
|
Requires: /usr/bin/touch
|
||||||
Requires: dhcp = %{version}
|
Requires: dhcp = %{version}
|
||||||
|
%if 0%{?suse_version} >= 1330
|
||||||
|
Requires: hostname
|
||||||
|
%else
|
||||||
|
Requires: net-tools
|
||||||
|
%endif
|
||||||
Requires: iproute2
|
Requires: iproute2
|
||||||
Requires: iputils
|
Requires: iputils
|
||||||
Requires: net-tools
|
|
||||||
|
|
||||||
%package relay
|
%package relay
|
||||||
Summary: ISC DHCP Relay Agent
|
Summary: ISC DHCP Relay Agent
|
||||||
Group: Productivity/Networking/Boot/Servers
|
Group: Productivity/Networking/Boot/Servers
|
||||||
Requires: dhcp = %{version}
|
Requires: dhcp = %{version}
|
||||||
Requires: net-tools
|
Requires: net-tools
|
||||||
%if !%{with systemd}
|
|
||||||
PreReq: %insserv_prereq
|
|
||||||
%endif
|
|
||||||
PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp
|
PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
@ -270,6 +261,9 @@ bind_dir=$(ls -1d bind-*)
|
|||||||
for i in /usr/share/automake-*/config.{sub,guess} ; do
|
for i in /usr/share/automake-*/config.{sub,guess} ; do
|
||||||
install -v -m755 $i $bind_dir/
|
install -v -m755 $i $bind_dir/
|
||||||
done
|
done
|
||||||
|
# use the year from source gzip header instead of current one to make reproducible rpms
|
||||||
|
year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < bind.tar.gz)
|
||||||
|
sed -i "s/stdout, copyright, year/stdout, copyright, \"-$year\"/" $bind_dir/lib/dns/gen.c
|
||||||
popd
|
popd
|
||||||
##
|
##
|
||||||
|
|
||||||
@ -336,12 +330,6 @@ make %{?_smp_mflags}
|
|||||||
./server/dhcpd -4 -t -cf $RPM_SOURCE_DIR/dhcpd.conf
|
./server/dhcpd -4 -t -cf $RPM_SOURCE_DIR/dhcpd.conf
|
||||||
./server/dhcpd -6 -t -cf $RPM_SOURCE_DIR/dhcpd6.conf
|
./server/dhcpd -6 -t -cf $RPM_SOURCE_DIR/dhcpd6.conf
|
||||||
# check syntax in our scripts
|
# check syntax in our scripts
|
||||||
%if !%{with systemd}
|
|
||||||
bash -n $RPM_SOURCE_DIR/rc.dhcpd
|
|
||||||
bash -n $RPM_SOURCE_DIR/rc.dhcpd6
|
|
||||||
bash -n $RPM_SOURCE_DIR/rc.dhcrelay
|
|
||||||
bash -n $RPM_SOURCE_DIR/rc.dhcrelay6
|
|
||||||
%endif
|
|
||||||
bash -n $RPM_SOURCE_DIR/dhcpd.script
|
bash -n $RPM_SOURCE_DIR/dhcpd.script
|
||||||
bash -n $RPM_SOURCE_DIR/dhcrelay.script
|
bash -n $RPM_SOURCE_DIR/dhcrelay.script
|
||||||
bash -n $RPM_SOURCE_DIR/dhclient-script
|
bash -n $RPM_SOURCE_DIR/dhclient-script
|
||||||
@ -359,7 +347,7 @@ install -d -m0755 $RPM_BUILD_ROOT/%{omc_svcdir}
|
|||||||
install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema
|
install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema
|
||||||
%endif
|
%endif
|
||||||
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/run
|
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/run
|
||||||
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates
|
install -d -m0755 $RPM_BUILD_ROOT%{_fillupdir}
|
||||||
# chroot jail
|
# chroot jail
|
||||||
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/etc
|
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/etc
|
||||||
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/dev
|
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/dev
|
||||||
@ -385,7 +373,6 @@ install -m0755 $RPM_SOURCE_DIR/dhcpd.script \
|
|||||||
sed -e 's/@LIBDIR@/%{_lib}/g' -i $RPM_BUILD_ROOT/usr/lib/dhcp/dhcpd
|
sed -e 's/@LIBDIR@/%{_lib}/g' -i $RPM_BUILD_ROOT/usr/lib/dhcp/dhcpd
|
||||||
install -m0755 $RPM_SOURCE_DIR/dhcrelay.script \
|
install -m0755 $RPM_SOURCE_DIR/dhcrelay.script \
|
||||||
$RPM_BUILD_ROOT/usr/lib/dhcp/dhcrelay
|
$RPM_BUILD_ROOT/usr/lib/dhcp/dhcrelay
|
||||||
%if %{with systemd}
|
|
||||||
# service units
|
# service units
|
||||||
install -d -m0755 $RPM_BUILD_ROOT%{_unitdir}
|
install -d -m0755 $RPM_BUILD_ROOT%{_unitdir}
|
||||||
install -m0644 $RPM_SOURCE_DIR/dhcpd.service \
|
install -m0644 $RPM_SOURCE_DIR/dhcpd.service \
|
||||||
@ -401,23 +388,6 @@ ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd
|
|||||||
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd6
|
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd6
|
||||||
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay
|
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay
|
||||||
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6
|
ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6
|
||||||
%else
|
|
||||||
# service scripts
|
|
||||||
install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
|
|
||||||
install -m0755 $RPM_SOURCE_DIR/rc.dhcpd \
|
|
||||||
$RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcpd
|
|
||||||
install -m0755 $RPM_SOURCE_DIR/rc.dhcpd6 \
|
|
||||||
$RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcpd6
|
|
||||||
install -m0755 $RPM_SOURCE_DIR/rc.dhcrelay \
|
|
||||||
$RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcrelay
|
|
||||||
install -m0755 $RPM_SOURCE_DIR/rc.dhcrelay6 \
|
|
||||||
$RPM_BUILD_ROOT%{_sysconfdir}/init.d/dhcrelay6
|
|
||||||
# rcservice links
|
|
||||||
ln -sf %{_sysconfdir}/init.d/dhcpd $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd
|
|
||||||
ln -sf %{_sysconfdir}/init.d/dhcpd6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd6
|
|
||||||
ln -sf %{_sysconfdir}/init.d/dhcrelay $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay
|
|
||||||
ln -sf %{_sysconfdir}/init.d/dhcrelay6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6
|
|
||||||
%endif
|
|
||||||
%if %suse_version > 1310
|
%if %suse_version > 1310
|
||||||
# rcservice actions
|
# rcservice actions
|
||||||
legacy_actionsdir=$RPM_BUILD_ROOT/usr/lib/initscripts/legacy-actions
|
legacy_actionsdir=$RPM_BUILD_ROOT/usr/lib/initscripts/legacy-actions
|
||||||
@ -442,11 +412,11 @@ rm -f dhcpd.action
|
|||||||
%endif
|
%endif
|
||||||
# sysconfig files
|
# sysconfig files
|
||||||
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \
|
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \
|
||||||
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
|
$RPM_BUILD_ROOT%{_fillupdir}/
|
||||||
install -m0644 $RPM_SOURCE_DIR/sysconfig.syslog-dhcpd \
|
install -m0644 $RPM_SOURCE_DIR/sysconfig.syslog-dhcpd \
|
||||||
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
|
$RPM_BUILD_ROOT%{_fillupdir}/
|
||||||
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \
|
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \
|
||||||
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
|
$RPM_BUILD_ROOT%{_fillupdir}/
|
||||||
# another config files and scripts
|
# another config files and scripts
|
||||||
%if %{with_ldap}
|
%if %{with_ldap}
|
||||||
install -m0644 contrib/ldap/dhcp.schema \
|
install -m0644 contrib/ldap/dhcp.schema \
|
||||||
@ -498,21 +468,14 @@ mv $RPM_BUILD_ROOT%_libdir/lib*.* \
|
|||||||
|
|
||||||
%pre server
|
%pre server
|
||||||
/usr/sbin/useradd -r -g nogroup -s /bin/false -c "DHCP server daemon" -d /var/lib/dhcp dhcpd 2> /dev/null ||:
|
/usr/sbin/useradd -r -g nogroup -s /bin/false -c "DHCP server daemon" -d /var/lib/dhcp dhcpd 2> /dev/null ||:
|
||||||
%if %{with systemd}
|
|
||||||
%service_add_pre dhcpd.service
|
%service_add_pre dhcpd.service
|
||||||
%service_add_pre dhcpd6.service
|
%service_add_pre dhcpd6.service
|
||||||
%endif
|
|
||||||
|
|
||||||
%post server
|
%post server
|
||||||
%if %{with systemd}
|
|
||||||
%{fillup_only -n dhcpd dhcpd}
|
%{fillup_only -n dhcpd dhcpd}
|
||||||
%{fillup_only -ans syslog dhcpd}
|
%{fillup_only -ans syslog dhcpd}
|
||||||
%service_add_post dhcpd.service
|
%service_add_post dhcpd.service
|
||||||
%service_add_post dhcpd6.service
|
%service_add_post dhcpd6.service
|
||||||
%else
|
|
||||||
%{fillup_and_insserv -n dhcpd dhcpd dhcpd6}
|
|
||||||
%{fillup_only -ans syslog dhcpd}
|
|
||||||
%endif
|
|
||||||
# FIXME: update?
|
# FIXME: update?
|
||||||
if [ ${FIRST_ARG:-0} -gt 1 ]; then
|
if [ ${FIRST_ARG:-0} -gt 1 ]; then
|
||||||
if grep -q '^DHCPD_RUN_AS=.*nobody' etc/sysconfig/dhcpd; then
|
if grep -q '^DHCPD_RUN_AS=.*nobody' etc/sysconfig/dhcpd; then
|
||||||
@ -530,37 +493,16 @@ if [ ${FIRST_ARG:-0} -gt 1 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%preun server
|
%preun server
|
||||||
%if %{with systemd}
|
|
||||||
%service_del_preun dhcpd.service
|
%service_del_preun dhcpd.service
|
||||||
%service_del_preun dhcpd6.service
|
%service_del_preun dhcpd6.service
|
||||||
%else
|
|
||||||
if test -x /etc/init.d/dhcpd ; then
|
|
||||||
%stop_on_removal dhcpd
|
|
||||||
fi
|
|
||||||
if test -x /etc/init.d/dhcpd6 ; then
|
|
||||||
%stop_on_removal dhcpd6
|
|
||||||
fi
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%postun server
|
%postun server
|
||||||
%if %{with systemd}
|
|
||||||
%service_del_postun dhcpd.service
|
%service_del_postun dhcpd.service
|
||||||
%service_del_postun dhcpd6.service
|
%service_del_postun dhcpd6.service
|
||||||
%else
|
|
||||||
if test -x /etc/init.d/dhcpd ; then
|
|
||||||
%restart_on_update dhcpd
|
|
||||||
fi
|
|
||||||
if test -x /etc/init.d/dhcpd6 ; then
|
|
||||||
%restart_on_update dhcpd6
|
|
||||||
fi
|
|
||||||
%insserv_cleanup
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%pre relay
|
%pre relay
|
||||||
%if %{with systemd}
|
|
||||||
%service_add_pre dhcrelay.service
|
%service_add_pre dhcrelay.service
|
||||||
%service_add_pre dhcrelay6.service
|
%service_add_pre dhcrelay6.service
|
||||||
%endif
|
|
||||||
|
|
||||||
%post relay
|
%post relay
|
||||||
#
|
#
|
||||||
@ -569,40 +511,17 @@ fi
|
|||||||
%{rename_sysconfig_variable -f etc/sysconfig/dhcrelay
|
%{rename_sysconfig_variable -f etc/sysconfig/dhcrelay
|
||||||
DHCRELAY6_UPPER_INTERFACES_ARGS DHCRELAY6_UPPER_INTERFACES}
|
DHCRELAY6_UPPER_INTERFACES_ARGS DHCRELAY6_UPPER_INTERFACES}
|
||||||
#
|
#
|
||||||
%if %{with systemd}
|
|
||||||
%{fillup_only -n dhcrelay dhcrelay}
|
%{fillup_only -n dhcrelay dhcrelay}
|
||||||
%service_add_post dhcrelay.service
|
%service_add_post dhcrelay.service
|
||||||
%service_add_post dhcrelay6.service
|
%service_add_post dhcrelay6.service
|
||||||
%else
|
|
||||||
%{fillup_and_insserv -n dhcrelay dhcrelay dhcrelay6}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%preun relay
|
%preun relay
|
||||||
%if %{with systemd}
|
|
||||||
%service_del_preun dhcrelay.service
|
%service_del_preun dhcrelay.service
|
||||||
%service_del_preun dhcrelay6.service
|
%service_del_preun dhcrelay6.service
|
||||||
%else
|
|
||||||
if test -x /etc/init.d/dhcrelay ; then
|
|
||||||
%stop_on_removal dhcrelay
|
|
||||||
fi
|
|
||||||
if test -x /etc/init.d/dhcrelay6 ; then
|
|
||||||
%stop_on_removal dhcrelay6
|
|
||||||
fi
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%postun relay
|
%postun relay
|
||||||
%if %{with systemd}
|
|
||||||
%service_del_postun dhcrelay.service
|
%service_del_postun dhcrelay.service
|
||||||
%service_del_postun dhcrelay6.service
|
%service_del_postun dhcrelay6.service
|
||||||
%else
|
|
||||||
if test -x /etc/init.d/dhcrelay ; then
|
|
||||||
%restart_on_update dhcrelay
|
|
||||||
fi
|
|
||||||
if test -x /etc/init.d/dhcrelay6 ; then
|
|
||||||
%restart_on_update dhcrelay6
|
|
||||||
fi
|
|
||||||
%insserv_cleanup
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%post client
|
%post client
|
||||||
test -e %{_localstatedir}/lib/dhcp/dhclient.leases || \
|
test -e %{_localstatedir}/lib/dhcp/dhclient.leases || \
|
||||||
@ -628,7 +547,6 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
|||||||
%{_sbindir}/dhcpd6
|
%{_sbindir}/dhcpd6
|
||||||
%{_sbindir}/rcdhcpd
|
%{_sbindir}/rcdhcpd
|
||||||
%{_sbindir}/rcdhcpd6
|
%{_sbindir}/rcdhcpd6
|
||||||
%if %{with systemd}
|
|
||||||
%{_unitdir}/dhcpd.service
|
%{_unitdir}/dhcpd.service
|
||||||
%{_unitdir}/dhcpd6.service
|
%{_unitdir}/dhcpd6.service
|
||||||
%if %suse_version > 1310
|
%if %suse_version > 1310
|
||||||
@ -637,10 +555,6 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
|||||||
%dir /usr/lib/initscripts/legacy-actions/dhcpd6
|
%dir /usr/lib/initscripts/legacy-actions/dhcpd6
|
||||||
/usr/lib/initscripts/legacy-actions/dhcpd6/*
|
/usr/lib/initscripts/legacy-actions/dhcpd6/*
|
||||||
%endif
|
%endif
|
||||||
%else
|
|
||||||
%config %{_sysconfdir}/init.d/dhcpd
|
|
||||||
%config %{_sysconfdir}/init.d/dhcpd6
|
|
||||||
%endif
|
|
||||||
%config(noreplace) %{_sysconfdir}/dhcpd.conf
|
%config(noreplace) %{_sysconfdir}/dhcpd.conf
|
||||||
%config(noreplace) %{_sysconfdir}/dhcpd6.conf
|
%config(noreplace) %{_sysconfdir}/dhcpd6.conf
|
||||||
%attr(755,root,root) %dir %config(noreplace) %ghost %{_sysconfdir}/dhcpd.d/
|
%attr(755,root,root) %dir %config(noreplace) %ghost %{_sysconfdir}/dhcpd.d/
|
||||||
@ -675,8 +589,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
|||||||
%{omc_svcdir}/dhcpd6.xml
|
%{omc_svcdir}/dhcpd6.xml
|
||||||
%{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook
|
%{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook
|
||||||
%{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook
|
%{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcpd
|
%{_fillupdir}/sysconfig.dhcpd
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-dhcpd
|
%{_fillupdir}/sysconfig.syslog-dhcpd
|
||||||
%if %{with_doc_package}
|
%if %{with_doc_package}
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
@ -708,15 +622,10 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
|
|||||||
%{_sbindir}/rcdhcrelay6
|
%{_sbindir}/rcdhcrelay6
|
||||||
%dir /usr/lib/dhcp
|
%dir /usr/lib/dhcp
|
||||||
/usr/lib/dhcp/dhcrelay
|
/usr/lib/dhcp/dhcrelay
|
||||||
%if %{with systemd}
|
|
||||||
%{_unitdir}/dhcrelay.service
|
%{_unitdir}/dhcrelay.service
|
||||||
%{_unitdir}/dhcrelay6.service
|
%{_unitdir}/dhcrelay6.service
|
||||||
%else
|
|
||||||
%config %{_sysconfdir}/init.d/dhcrelay
|
|
||||||
%config %{_sysconfdir}/init.d/dhcrelay6
|
|
||||||
%endif
|
|
||||||
%doc %{_mandir}/man8/dhcrelay.8.gz
|
%doc %{_mandir}/man8/dhcrelay.8.gz
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcrelay
|
%{_fillupdir}/sysconfig.dhcrelay
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
51
rc.dhcpd
51
rc.dhcpd
@ -1,51 +0,0 @@
|
|||||||
#! /bin/bash
|
|
||||||
# Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH
|
|
||||||
# Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH
|
|
||||||
# Copyright (c) 2002, 2003 SuSE Linux AG
|
|
||||||
# Copyright (c) 2004-2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
||||||
# Copyright (c) 2013-2014 SUSE LINUX GmbH, Nuernberg, Germany.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
||||||
# details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along with
|
|
||||||
# this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# Author: Rolf Haberrecker <rolf@suse.de>, 1997-1999
|
|
||||||
# Peter Poeml <poeml@suse.de>, 2000-2006
|
|
||||||
# Marius Tomaschewski <mt@suse.de>, 2006-2010
|
|
||||||
#
|
|
||||||
# /etc/init.d/dhcp-server
|
|
||||||
# and its symbolic link
|
|
||||||
# /usr/sbin/rcdhcp-server
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: dhcp-server
|
|
||||||
# Required-Start: $remote_fs $network
|
|
||||||
# Should-Start: network-remotefs $named $syslog $time ldap ndsd
|
|
||||||
# Required-Stop: $remote_fs $network
|
|
||||||
# Should-Stop: network-remotefs $named $syslog ldap ndsd
|
|
||||||
# Default-Start: 3 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: ISC DHCP 4.x Server
|
|
||||||
# Description: Start ISC DHCP (Dynamic Host Configuration Protocol)
|
|
||||||
# 4.x series server.
|
|
||||||
# (Note: if configured for failover it
|
|
||||||
# needs to rely on time synchronisation.)
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
test -x /usr/lib/dhcp/dhcpd || exit 5
|
|
||||||
case $1 in
|
|
||||||
start|stop|try-restart|restart|force-reload|reload|status|probe|*)
|
|
||||||
export SCRIPT=${0##*/}
|
|
||||||
exec /usr/lib/dhcp/dhcpd -4 "$@" || exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
52
rc.dhcpd6
52
rc.dhcpd6
@ -1,52 +0,0 @@
|
|||||||
#! /bin/bash
|
|
||||||
# Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH
|
|
||||||
# Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH
|
|
||||||
# Copyright (c) 2002, 2003 SuSE Linux AG
|
|
||||||
# Copyright (c) 2004-2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
||||||
# Copyright (c) 2004-2013 SUSE LINUX GmbH, Nuernberg, Germany.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
||||||
# details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along with
|
|
||||||
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
||||||
# Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
#
|
|
||||||
# Author: Rolf Haberrecker <rolf@suse.de>, 1997-1999
|
|
||||||
# Peter Poeml <poeml@suse.de>, 2000-2006
|
|
||||||
# Marius Tomaschewski <mt@suse.de>, 2006-2010
|
|
||||||
#
|
|
||||||
# /etc/init.d/dhcp-server
|
|
||||||
# and its symbolic link
|
|
||||||
# /usr/sbin/rcdhcp-server
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: dhcp6-server
|
|
||||||
# Required-Start: $remote_fs $network
|
|
||||||
# Should-Start: network-remotefs $named $syslog $time ldap ndsd
|
|
||||||
# Required-Stop: $remote_fs $network
|
|
||||||
# Should-Stop: network-remotefs $named $syslog ldap ndsd
|
|
||||||
# Default-Start: 3 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: ISC DHCP 4.x Server
|
|
||||||
# Description: Start ISC DHCP (Dynamic Host Configuration Protocol)
|
|
||||||
# 4.x series server.
|
|
||||||
# (Note: if configured for failover it
|
|
||||||
# needs to rely on time synchronisation.)
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
test -x /usr/lib/dhcp/dhcpd || exit 5
|
|
||||||
case $1 in
|
|
||||||
start|stop|try-restart|restart|force-reload|reload|status|probe|*)
|
|
||||||
export SCRIPT=${0##*/}
|
|
||||||
exec /usr/lib/dhcp/dhcpd -6 "$@" || exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
49
rc.dhcrelay
49
rc.dhcrelay
@ -1,49 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
# Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH
|
|
||||||
# Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH
|
|
||||||
# Copyright (c) 2002 SuSE Linux AG
|
|
||||||
# Copyright (c) 2003-2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
||||||
# Copyright (C) 2013-2014 SUSE LINUX GmbH, Nuernberg, Germany.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
||||||
# details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along with
|
|
||||||
# this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# Author: Peter Poeml <poeml@suse.de>, 2001
|
|
||||||
# Marius Tomaschewski <mt@suse.de>, 2010
|
|
||||||
#
|
|
||||||
# /etc/init.d/dhcrelay
|
|
||||||
# and its symbolic link
|
|
||||||
# /usr/sbin/rcdhcrelay
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: dhcrelay
|
|
||||||
# Required-Start: $network $remote_fs network-remotefs
|
|
||||||
# Should-Start: $named $syslog $time
|
|
||||||
# Required-Stop: $network $remote_fs network-remotefs
|
|
||||||
# Should-Stop: $named $syslog
|
|
||||||
# Default-Start: 3 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: DHCP Relay
|
|
||||||
# Description: Start DHCP (Dynamic Host Configuration Protocol)
|
|
||||||
# relay agent, forwarding DHCP requests from one
|
|
||||||
# physical network segment to another.
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
test -x /usr/lib/dhcp/dhcrelay || exit 5
|
|
||||||
case $1 in
|
|
||||||
start|stop|try-restart|restart|force-reload|reload|status|probe|*)
|
|
||||||
export SCRIPT=${0##*/}
|
|
||||||
exec /usr/lib/dhcp/dhcrelay -4 "$@" || exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
49
rc.dhcrelay6
49
rc.dhcrelay6
@ -1,49 +0,0 @@
|
|||||||
#! /bin/sh
|
|
||||||
# Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH
|
|
||||||
# Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH
|
|
||||||
# Copyright (c) 2002 SuSE Linux AG
|
|
||||||
# Copyright (c) 2003-2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
|
||||||
# Copyright (C) 2013-2014 SUSE LINUX GmbH, Nuernberg, Germany.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License as published by the Free Software
|
|
||||||
# Foundation; either version 2 of the License, or (at your option) any later
|
|
||||||
# version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
||||||
# details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along with
|
|
||||||
# this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# Author: Peter Poeml <poeml@suse.de>, 2001
|
|
||||||
# Marius Tomaschewski <mt@suse.de>, 2010
|
|
||||||
#
|
|
||||||
# /etc/init.d/dhcrelay6
|
|
||||||
# and its symbolic link
|
|
||||||
# /usr/sbin/rcdhcrelay6
|
|
||||||
#
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: dhcrelay6
|
|
||||||
# Required-Start: $network $remote_fs network-remotefs
|
|
||||||
# Should-Start: $named $syslog $time
|
|
||||||
# Required-Stop: $network $remote_fs network-remotefs
|
|
||||||
# Should-Stop: $named $syslog
|
|
||||||
# Default-Start: 3 5
|
|
||||||
# Default-Stop: 0 1 2 6
|
|
||||||
# Short-Description: DHCPv6 Relay
|
|
||||||
# Description: Start DHCPv6 (Dynamic Host Configuration Protocol)
|
|
||||||
# relay agent, forwarding DHCP requests from one
|
|
||||||
# physical network segment to another.
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
test -x /usr/lib/dhcp/dhcrelay || exit 5
|
|
||||||
case $1 in
|
|
||||||
start|stop|try-restart|restart|force-reload|reload|status|probe|*)
|
|
||||||
export SCRIPT=${0##*/}
|
|
||||||
exec /usr/lib/dhcp/dhcrelay -6 "$@" || exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user