Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/dhcp bye build glue
details: https://anonhg.NetBSD.org/src/rev/2570c68ad026
branches: trunk
changeset: 787495:2570c68ad026
user: christos <christos%NetBSD.org@localhost>
date: Thu Jun 20 18:41:26 2013 +0000
description:
bye build glue
diffstat:
usr.sbin/dhcp/Makefile | 6 -
usr.sbin/dhcp/Makefile.inc | 34 ---
usr.sbin/dhcp/client/Makefile | 18 -
usr.sbin/dhcp/clientscript/Makefile | 8 -
usr.sbin/dhcp/clientscript/dhclient-script | 296 -----------------------------
usr.sbin/dhcp/common/Makefile | 14 -
usr.sbin/dhcp/dhcpctl/Makefile | 10 -
usr.sbin/dhcp/dst/Makefile | 12 -
usr.sbin/dhcp/minires/Makefile | 15 -
usr.sbin/dhcp/omapip/Makefile | 13 -
usr.sbin/dhcp/omshell/Makefile | 16 -
usr.sbin/dhcp/relay/Makefile | 9 -
usr.sbin/dhcp/server/Makefile | 18 -
usr.sbin/dhcp/share/Makefile | 5 -
usr.sbin/dhcp/share/dhcpd/Makefile | 10 -
usr.sbin/dhcp/share/dhcpd/pxe.defs | 113 -----------
16 files changed, 0 insertions(+), 597 deletions(-)
diffs (truncated from 661 to 300 lines):
diff -r bf3ef4f81b03 -r 2570c68ad026 usr.sbin/dhcp/Makefile
--- a/usr.sbin/dhcp/Makefile Thu Jun 20 18:39:14 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2002/02/09 21:13:31 thorpej Exp $
-
-SUBDIR= common minires dst omapip clientscript dhcpctl .WAIT
-SUBDIR+= server client relay omshell share
-
-.include <bsd.subdir.mk>
diff -r bf3ef4f81b03 -r 2570c68ad026 usr.sbin/dhcp/Makefile.inc
--- a/usr.sbin/dhcp/Makefile.inc Thu Jun 20 18:39:14 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.27 2012/08/10 12:10:28 joerg Exp $
-
-WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
-
-.include <bsd.own.mk>
-
-USE_FORT?= yes # network client/server
-CWARNFLAGS.clang+= -Wno-tautological-compare \
- -Wno-conversion -Wno-constant-logical-operand \
- -Wno-format-security
-
-DIST= ${NETBSDSRCDIR}/dist/dhcp
-.PATH: ${DIST}/${DHCPSRCDIR}
-
-COBJDIR!=cd $(.CURDIR)/../common && ${PRINTOBJDIR}
-OMOBJDIR!=cd $(.CURDIR)/../omapip && ${PRINTOBJDIR}
-MROBJDIR!=cd $(.CURDIR)/../minires && ${PRINTOBJDIR}
-DSTOBJDIR!=cd $(.CURDIR)/../dst && ${PRINTOBJDIR}
-
-.if defined(HAVE_GCC) || defined(HAVE_LLVM)
-COPTS+= -fno-strict-aliasing
-.endif
-
-CPPFLAGS+= -I${DIST} -I${DIST}/includes -Wno-unused
-LDADD+= ${COBJDIR}/libdhcp.a ${MROBJDIR}/libminires.a
-LDADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
-LDADD+= -lipsec
-DPADD+= ${COBJDIR}/libdhcp.a ${MROBJDIR}/libminires.a
-DPADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
-DPADD+= ${LIBIPSEC}
-
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
diff -r bf3ef4f81b03 -r 2570c68ad026 usr.sbin/dhcp/client/Makefile
--- a/usr.sbin/dhcp/client/Makefile Thu Jun 20 18:39:14 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2002/08/27 14:46:20 lukem Exp $
-
-.include <bsd.own.mk> # for MKDYNAMICROOT definition
-
-SRCS = dhclient.c clparse.c
-PROG = dhclient
-MAN = dhclient.8 dhclient.conf.5 dhclient.leases.5 dhclient-script.8
-CPPFLAGS += -DCLIENT_PATH='"PATH=/usr/bin:/usr/sbin:/bin:/sbin"'
-
-DHCPSRCDIR= client
-
-# XXX
-BINDIR?= /sbin
-.if (${MKDYNAMICROOT} == "no")
-LDSTATIC?= -static
-.endif
-
-.include <bsd.prog.mk>
diff -r bf3ef4f81b03 -r 2570c68ad026 usr.sbin/dhcp/clientscript/Makefile
--- a/usr.sbin/dhcp/clientscript/Makefile Thu Jun 20 18:39:14 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/09/18 13:31:53 lukem Exp $
-
-NOOBJ= # defined
-
-SCRIPTS=dhclient-script
-SCRIPTSDIR=/sbin
-
-.include <bsd.prog.mk>
diff -r bf3ef4f81b03 -r 2570c68ad026 usr.sbin/dhcp/clientscript/dhclient-script
--- a/usr.sbin/dhcp/clientscript/dhclient-script Thu Jun 20 18:39:14 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,296 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dhclient-script,v 1.13 2009/11/21 07:53:59 roy Exp $
-
-ENTERHOOKS=/etc/dhclient-enter-hooks
-EXITHOOKS=/etc/dhclient-exit-hooks
-RESOLV=/etc/resolv.conf
-SIGNATURE="# Created by dhclient from"
-INTSIG="$SIGNATURE $interface"
-
-echo_resolv_conf() {
- echo "$INTSIG"
- echo search $new_domain_name
- for nameserver in $new_domain_name_servers; do
- echo nameserver $nameserver
- done
-}
-
-make_resolv_conf() {
- if [ ! -z "$new_domain_name_servers" ]; then
- if [ -x /sbin/resolvconf ]; then
- echo_resolv_conf | /sbin/resolvconf -a $interface
- else
- if [ -f $RESOLV ]; then
- while read line; do
- case $line in
- "$SIGNATURE"*)
- ;;
- *)
- mv $RESOLV $RESOLV.save;;
- esac
- break
- done < $RESOLV
- fi
- echo_resolv_conf > $RESOLV
- fi
- fi
-}
-
-restore_resolv_conf() {
- if [ -x /sbin/resolvconf ]; then
- /sbin/resolvconf -d $interface
- elif [ -f $RESOLV.save -a -f $RESOLV ]; then
- while read line; do
- case $line in
- "$INTSIG"*)
- mv $RESOLV.save $RESOLV;;
- esac
- break
- done < $RESOLV
- fi
-}
-
-# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
-exit_with_hooks() {
- exit_status=$1
- if [ -f "$EXITHOOKS" ]; then
- . "$EXITHOOKS"
- fi
- # probably should do something with exit status of the local script
- exit $exit_status
-}
-
-
-add_new_routes() {
- for router in $new_routers; do
- route add default $router
- done >/dev/null 2>&1
-
- set -- $new_static_routes
- while [ $# -gt 1 ]; do
- route add $1 $2
- shift; shift
- done
-}
-
-delete_old_routes() {
- for router in $old_routers; do
- route delete default $router
- done >/dev/null 2>&1
-
- set -- $old_static_routes
- while [ $# -gt 1 ]; do
- route delete $1 $2
- shift; shift
- done
-
- route -n flush -inet -llinfo -host
-}
-
-# Invoke the local dhcp client enter hooks, if they exist.
-if [ -f $ENTERHOOKS ]; then
- exit_status=0
- . $ENTERHOOKS
- # allow the local script to abort processing of this state
- # local script must set exit_status variable to nonzero.
- if [ $exit_status -ne 0 ]; then
- exit $exit_status
- fi
-fi
-
-#if [ ! -z "$new_host_name" ]; then
-# echo New Host Name: $new_host_name
-#fi
-#
-#if [ ! -z "$new_nis_domain" ]; then
-# echo New NIS Domain: $new_nis_domain
-#fi
-#
-#if [ ! -z "$new_network_number" ]; then
-# echo New Network Number: $new_network_number
-#fi
-
-if [ ! -z "$new_broadcast_address" ]; then
-# echo New Broadcast Address: $new_broadcast_address
- new_broadcast_arg="broadcast $new_broadcast_address"
-fi
-
-if [ ! -z "$old_broadcast_address" ]; then
- old_broadcast_arg="broadcast $old_broadcast_address"
-fi
-
-if [ ! -z "$new_subnet_mask" ]; then
- new_netmask_arg="netmask $new_subnet_mask"
-fi
-
-if [ ! -z "$old_subnet_mask" ]; then
- old_netmask_arg="netmask $old_subnet_mask"
-fi
-
-if [ ! -z "$alias_subnet_mask" ]; then
- alias_subnet_arg="netmask $alias_subnet_mask"
-fi
-
-case "$reason" in
-MEDIUM)
- test -z "$medium" && exit_with_hooks 0
- eval "ifconfig $interface $medium"
- eval "ifconfig $interface inet -alias 0.0.0.0 $medium" >/dev/null 2>&1
-
- sleep 1
-
- exit_with_hooks 0
- ;;
-
-PREINIT)
- if [ ! -z "$alias_ip_address" ]; then
- ifconfig $interface inet \
- -alias $alias_ip_address >/dev/null 2>&1
- route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
- fi
-
- ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
- broadcast 255.255.255.255 up
-
- exit_with_hooks 0
- ;;
-
-ARPCHECK|ARPSEND)
- exit_with_hooks 0
- ;;
-
-BOUND|RENEW|REBIND|REBOOT)
- if [ ! -z "$new_nis_domain" ]; then
- if type domainname > /dev/null 2>&1; then
- domainname $new_nis_domain
- fi
- fi
-
- if type hostname > /dev/null 2>&1; then
- if [ \( -z "$current_hostname" \) -o \
- \( "x$new_host_name" = "x$old_hostname" \) ]; then
- current_hostname=`hostname`
- fi
- if [ \( -z "$current_hostname" \) -o \
- \( "x$new_host_name" != "x$old_hostname" \) ]; then
- hostname $new_host_name
- fi
- fi
-
- if [ \( ! -z "$old_ip_address" \) -a \( ! -z "$alias_ip_address" \) -a \
- \( "x$alias_ip_address" != "x$old_ip_address" \) ]; then
- ifconfig $interface inet \
- -alias $alias_ip_address > /dev/null 2>&1
- route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
- fi
-
- if [ \( ! -z "$old_ip_address" \) -a \
- \( "x$old_ip_address" != "x$new_ip_address" \) ]; then
- eval "ifconfig $interface inet -alias $old_ip_address $medium"
- route delete $old_ip_address 127.0.0.1 >/dev/null 2>&1
-
- delete_old_routes
- fi
-
- if [ \( -z "$old_ip_address" \) -o \
- \( "x$old_ip_address" != "x$new_ip_address" \) -o \
- \( "x$reason" = "xBOUND" \) -o \( "x$reason" = "xREBOOT" \) ]; then
- eval "ifconfig $interface inet $new_ip_address \
- $new_netmask_arg $new_broadcast_arg $medium"
- route add $new_ip_address 127.0.0.1 >/dev/null 2>&1
-
- add_new_routes
- fi
-
- if [ \( ! -z "$alias_ip_address" \) -a \
- \( "x$new_ip_address" != "x$alias_ip_address" \) ]; then
- ifconfig $interface inet alias $alias_ip_address \
- $alias_subnet_arg
- route add $alias_ip_address 127.0.0.1
- fi
- make_resolv_conf
- exit_with_hooks 0
- ;;
Home |
Main Index |
Thread Index |
Old Index