From a4b1b461d12d4c45a94f7e8f00d3d97f866888f4 Mon Sep 17 00:00:00 2001 From: tmclaugh Date: Tue, 4 Dec 2007 01:28:43 +0000 Subject: Fix dhcpd_devfs_enable on 7.x and later. PR: 115967 Submitted by: Eygene Ryabinkin Approved by: portmgr (linimon, pav), maintainer --- net/isc-dhcp40-server/Makefile | 1 + net/isc-dhcp40-server/files/isc-dhcpd.in | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'net/isc-dhcp40-server') diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile index ea88ac706d0..104bc99173b 100644 --- a/net/isc-dhcp40-server/Makefile +++ b/net/isc-dhcp40-server/Makefile @@ -8,6 +8,7 @@ PORTNAME= dhcp PORTVERSION= 3.0.5 +PORTREVISION= 1 PORTREVISION= ${DHCP_PORTREVISION} CATEGORIES= net MASTER_SITES= ${MASTER_SITE_ISC} diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.in b/net/isc-dhcp40-server/files/isc-dhcpd.in index 82f249ad557..70ba25b92d9 100644 --- a/net/isc-dhcp40-server/files/isc-dhcpd.in +++ b/net/isc-dhcp40-server/files/isc-dhcpd.in @@ -354,11 +354,14 @@ check_chroot () err 1 "dhcpd_devfs_enable and dhcpd_makedev_enable" \ "are mutually exclusive. enable only one!" fi - if checkyesno dhcpd_devfs_enable && - ! ( type mount_devfs ) > /dev/null 2>&1; then - warn "dhcpd_devfs_enable disabled" \ - "-- not available" - dhcpd_devfs_enable=NO + if test `uname -r | cut -c 1` -le 6; then + if checkyesno dhcpd_devfs_enable && + ! ( type mount_devfs ) > /dev/null 2>&1; + then + warn "dhcpd_devfs_enable disabled" \ + "-- not available" + dhcpd_devfs_enable=NO + fi fi if checkyesno dhcpd_makedev_enable && ! [ -x ${__dhcpd_devdir}/MAKEDEV ]; then -- cgit