From c3ef98f4f3b509e9b44d0d14e6796c82846f2d01c8cc3fe5f29d8dee2df14cd6 Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Mon, 9 Oct 2017 08:22:17 +0000 Subject: [PATCH 1/4] Accepting request 510075 from home:bmwiedemann:branches:network:dhcp use .gz year instead of current one to make build reproducible OBS-URL: https://build.opensuse.org/request/show/510075 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=176 --- dhcp.changes | 5 +++++ dhcp.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dhcp.changes b/dhcp.changes index 65db6ae..b922ee8 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/dhcp.spec b/dhcp.spec index 95a89c4..aa5d269 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -270,6 +270,9 @@ bind_dir=$(ls -1d bind-*) for i in /usr/share/automake-*/config.{sub,guess} ; do install -v -m755 $i $bind_dir/ 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 ## From 8e9bc2bd040f77b3428a1e87e17709b57c1f7225a587a9a226b7cd49a719dfc5 Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Wed, 18 Oct 2017 09:10:44 +0000 Subject: [PATCH 2/4] Accepting request 532836 from home:dimstar:Factory Sure.. I can keep on rebasing it.. I don't mind OBS-URL: https://build.opensuse.org/request/show/532836 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=177 --- dhcp.changes | 10 +++++++++- dhcp.spec | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index b922ee8..1694477 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 @@ -6,7 +14,7 @@ Thu Jul 13 12:27:59 UTC 2017 - bwiedemann@suse.com ------------------------------------------------------------------- Thu Jul 6 16:17:18 CEST 2017 - ndas@suse.de -- fixed a typo in nis-servers option name breaking the config file introduced +- fixed a typo in nis-servers option name breaking the config file introduced in previous change to workaround issues in NetworkManager parser. - Update to dhcp-4.3.5 diff --git a/dhcp.spec b/dhcp.spec index aa5d269..ee4b9d6 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -141,9 +141,13 @@ Group: Productivity/Networking/Boot/Clients Requires: /usr/bin/host Requires: /usr/bin/touch Requires: dhcp = %{version} +%if 0%{?suse_version} >= 1330 +Requires: hostname +%else +Requires: net-tools +%endif Requires: iproute2 Requires: iputils -Requires: net-tools %package relay Summary: ISC DHCP Relay Agent From 917d150f5dbd521182e54e1484f46a0e165080e7fc5e28511e86890b70380e0d Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Fri, 24 Nov 2017 10:37:35 +0000 Subject: [PATCH 3/4] Accepting request 544891 from home:RBrownSUSE:branches:network:dhcp Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544891 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=178 --- dhcp.changes | 6 ++++++ dhcp.spec | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index 1694477..762b12e 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/dhcp.spec b/dhcp.spec index ee4b9d6..d0129f5 100644 --- a/dhcp.spec +++ b/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 susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define omc_prefix /usr/share/omc @@ -366,7 +371,7 @@ install -d -m0755 $RPM_BUILD_ROOT/%{omc_svcdir} install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema %endif 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 install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/etc install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/dev @@ -449,11 +454,11 @@ rm -f dhcpd.action %endif # sysconfig files 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 \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \ - $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ + $RPM_BUILD_ROOT%{_fillupdir}/ # another config files and scripts %if %{with_ldap} install -m0644 contrib/ldap/dhcp.schema \ @@ -682,8 +687,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %{omc_svcdir}/dhcpd6.xml %{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook %{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook -%{_localstatedir}/adm/fillup-templates/sysconfig.dhcpd -%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-dhcpd +%{_fillupdir}/sysconfig.dhcpd +%{_fillupdir}/sysconfig.syslog-dhcpd %if %{with_doc_package} %files doc @@ -723,7 +728,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %config %{_sysconfdir}/init.d/dhcrelay6 %endif %doc %{_mandir}/man8/dhcrelay.8.gz -%{_localstatedir}/adm/fillup-templates/sysconfig.dhcrelay +%{_fillupdir}/sysconfig.dhcrelay %files devel %defattr(-,root,root) From fe306dab60112592b7dd13589308bc2328fd433531c786d817ce15ef90abc00a Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 15 Dec 2017 11:00:06 +0000 Subject: [PATCH 4/4] Accepting request 556893 from home:markoschandras:branches:network:dhcp - 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. OBS-URL: https://build.opensuse.org/request/show/556893 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=179 --- dhcp.changes | 7 ++++ dhcp.spec | 103 --------------------------------------------------- rc.dhcpd | 51 ------------------------- rc.dhcpd6 | 52 -------------------------- rc.dhcrelay | 49 ------------------------ rc.dhcrelay6 | 49 ------------------------ 6 files changed, 7 insertions(+), 304 deletions(-) delete mode 100644 rc.dhcpd delete mode 100644 rc.dhcpd6 delete mode 100644 rc.dhcrelay delete mode 100644 rc.dhcrelay6 diff --git a/dhcp.changes b/dhcp.changes index 762b12e..2531317 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/dhcp.spec b/dhcp.spec index d0129f5..42c4651 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -31,11 +31,6 @@ %define with_ldapcasa 0%{?sles_version} >= 10 || (%suse_version >= 1110 && %suse_version < 1140) # doc package is new on 11.3 %define with_doc_package %suse_version >= 1130 -%if 0%{?suse_version} >= 1310 -%bcond_without systemd -%else -%bcond_with systemd -%endif Name: dhcp %if %{with_ldap} @@ -58,17 +53,10 @@ Source2: %{name}.keyring # Source10: dhcpd.script Source11: dhcrelay.script -%if %{with systemd} Source12: dhcpd.service Source13: dhcpd6.service Source14: dhcrelay.service Source15: dhcrelay6.service -%else -Source12: rc.dhcpd -Source13: rc.dhcpd6 -Source14: rc.dhcrelay -Source15: rc.dhcrelay6 -%endif Source17: sysconfig.dhcpd Source18: sysconfig.dhcrelay Source19: if-up.d.dhcpd-restart-hook @@ -135,9 +123,6 @@ Summary: ISC DHCP Server Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires: net-tools -%if !%{with systemd} -PreReq: %insserv_prereq -%endif PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd %package client @@ -159,9 +144,6 @@ Summary: ISC DHCP Relay Agent Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires: net-tools -%if !%{with systemd} -PreReq: %insserv_prereq -%endif PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp %package devel @@ -348,12 +330,6 @@ make %{?_smp_mflags} ./server/dhcpd -4 -t -cf $RPM_SOURCE_DIR/dhcpd.conf ./server/dhcpd -6 -t -cf $RPM_SOURCE_DIR/dhcpd6.conf # 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/dhcrelay.script bash -n $RPM_SOURCE_DIR/dhclient-script @@ -397,7 +373,6 @@ install -m0755 $RPM_SOURCE_DIR/dhcpd.script \ sed -e 's/@LIBDIR@/%{_lib}/g' -i $RPM_BUILD_ROOT/usr/lib/dhcp/dhcpd install -m0755 $RPM_SOURCE_DIR/dhcrelay.script \ $RPM_BUILD_ROOT/usr/lib/dhcp/dhcrelay -%if %{with systemd} # service units install -d -m0755 $RPM_BUILD_ROOT%{_unitdir} install -m0644 $RPM_SOURCE_DIR/dhcpd.service \ @@ -413,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}/rcdhcrelay 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 # rcservice actions legacy_actionsdir=$RPM_BUILD_ROOT/usr/lib/initscripts/legacy-actions @@ -510,21 +468,14 @@ mv $RPM_BUILD_ROOT%_libdir/lib*.* \ %pre server /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 dhcpd6.service -%endif %post server -%if %{with systemd} %{fillup_only -n dhcpd dhcpd} %{fillup_only -ans syslog dhcpd} %service_add_post dhcpd.service %service_add_post dhcpd6.service -%else -%{fillup_and_insserv -n dhcpd dhcpd dhcpd6} -%{fillup_only -ans syslog dhcpd} -%endif # FIXME: update? if [ ${FIRST_ARG:-0} -gt 1 ]; then if grep -q '^DHCPD_RUN_AS=.*nobody' etc/sysconfig/dhcpd; then @@ -542,37 +493,16 @@ if [ ${FIRST_ARG:-0} -gt 1 ]; then fi %preun server -%if %{with systemd} %service_del_preun dhcpd.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 -%if %{with systemd} %service_del_postun dhcpd.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 -%if %{with systemd} %service_add_pre dhcrelay.service %service_add_pre dhcrelay6.service -%endif %post relay # @@ -581,40 +511,17 @@ fi %{rename_sysconfig_variable -f etc/sysconfig/dhcrelay DHCRELAY6_UPPER_INTERFACES_ARGS DHCRELAY6_UPPER_INTERFACES} # -%if %{with systemd} %{fillup_only -n dhcrelay dhcrelay} %service_add_post dhcrelay.service %service_add_post dhcrelay6.service -%else -%{fillup_and_insserv -n dhcrelay dhcrelay dhcrelay6} -%endif %preun relay -%if %{with systemd} %service_del_preun dhcrelay.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 -%if %{with systemd} %service_del_postun dhcrelay.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 test -e %{_localstatedir}/lib/dhcp/dhclient.leases || \ @@ -640,7 +547,6 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %{_sbindir}/dhcpd6 %{_sbindir}/rcdhcpd %{_sbindir}/rcdhcpd6 -%if %{with systemd} %{_unitdir}/dhcpd.service %{_unitdir}/dhcpd6.service %if %suse_version > 1310 @@ -649,10 +555,6 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %dir /usr/lib/initscripts/legacy-actions/dhcpd6 /usr/lib/initscripts/legacy-actions/dhcpd6/* %endif -%else -%config %{_sysconfdir}/init.d/dhcpd -%config %{_sysconfdir}/init.d/dhcpd6 -%endif %config(noreplace) %{_sysconfdir}/dhcpd.conf %config(noreplace) %{_sysconfdir}/dhcpd6.conf %attr(755,root,root) %dir %config(noreplace) %ghost %{_sysconfdir}/dhcpd.d/ @@ -720,13 +622,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %{_sbindir}/rcdhcrelay6 %dir /usr/lib/dhcp /usr/lib/dhcp/dhcrelay -%if %{with systemd} %{_unitdir}/dhcrelay.service %{_unitdir}/dhcrelay6.service -%else -%config %{_sysconfdir}/init.d/dhcrelay -%config %{_sysconfdir}/init.d/dhcrelay6 -%endif %doc %{_mandir}/man8/dhcrelay.8.gz %{_fillupdir}/sysconfig.dhcrelay diff --git a/rc.dhcpd b/rc.dhcpd deleted file mode 100644 index ccad35d..0000000 --- a/rc.dhcpd +++ /dev/null @@ -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 . -# -# Author: Rolf Haberrecker , 1997-1999 -# Peter Poeml , 2000-2006 -# Marius Tomaschewski , 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 - diff --git a/rc.dhcpd6 b/rc.dhcpd6 deleted file mode 100644 index b471bf8..0000000 --- a/rc.dhcpd6 +++ /dev/null @@ -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 , 1997-1999 -# Peter Poeml , 2000-2006 -# Marius Tomaschewski , 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 - diff --git a/rc.dhcrelay b/rc.dhcrelay deleted file mode 100644 index 7fd6ead..0000000 --- a/rc.dhcrelay +++ /dev/null @@ -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 . -# -# Author: Peter Poeml , 2001 -# Marius Tomaschewski , 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 - diff --git a/rc.dhcrelay6 b/rc.dhcrelay6 deleted file mode 100644 index 36fdf8d..0000000 --- a/rc.dhcrelay6 +++ /dev/null @@ -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 . -# -# Author: Peter Poeml , 2001 -# Marius Tomaschewski , 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 -