Make BOOTP server in installer work with dhcp server from pkgsrc.
authorHasso Tepper <hasso@dragonflybsd.org>
Sat, 30 Aug 2008 16:47:47 +0000 (16:47 +0000)
committerHasso Tepper <hasso@dragonflybsd.org>
Sat, 30 Aug 2008 16:47:47 +0000 (16:47 +0000)
contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c
nrelease/Makefile
nrelease/installer/etc/dhcpd.conf
share/installer/cmdnames.conf

index a74ff90..6c304eb 100644 (file)
@@ -1408,7 +1408,7 @@ state_setup_remote_installation_server(struct i_fn_args *a)
                            a->os_root, cmd_name(a, "INETD"));
                        command_add(cmds, "%s%s %svar/db/dhcpd.leases",
                            a->os_root, cmd_name(a, "TOUCH"), a->os_root);
-                       command_add(cmds, "%s%s >%sdev/null 2>&1",
+                       command_add(cmds, "%s%s -cf /etc/dhcpd.conf >%sdev/null 2>&1",
                            a->os_root, cmd_name(a, "DHCPD"), a->os_root);
                        command_add(cmds, "%s%s >%sdev/null 2>&1",
                            a->os_root, cmd_name(a, "RPCBIND"), a->os_root);
index 2efdb8d..7d7c04f 100644 (file)
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.86 2008/07/27 22:10:53 swildner Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.87 2008/08/30 16:47:47 hasso Exp $
 #
 
 #########################################################################
@@ -63,7 +63,8 @@ CVSUP_BOOTSTRAP_KIT?= cvsup-bootstrap-20070716
 
 # Default packages to be installed on the release ISO.
 #
-PKGSRC_PACKAGES?=      cdrtools-ossdvd-2.01.1.36nb2.tgz
+PKGSRC_PACKAGES?=      cdrtools-ossdvd-2.01.1.36nb2.tgz \
+                       isc-dhcp-base-4.0.0 isc-dhcp-server-4.0.0
 
 # Even though buildiso wipes the packages, our check target has to run
 # first and old packages (listed as they appear in pkg_info) must be
index 56fa6ea..e8d857a 100644 (file)
@@ -1,6 +1,8 @@
-# $DragonFly: src/nrelease/installer/etc/dhcpd.conf,v 1.1 2005/04/08 03:25:18 dillon Exp $
+# $DragonFly: src/nrelease/installer/etc/dhcpd.conf,v 1.2 2008/08/30 16:47:47 hasso Exp $
 #
 
+pid-file-name "/var/run/dhcpd.pid";
+lease-file-name "/var/db/dhcpd.leases";
 ddns-update-style none;
 
 class "pxeboot-class" {
index 8eaa8e3..b6bce06 100644 (file)
@@ -1,6 +1,6 @@
 # Command names for DragonFly installer backend.
 # $Id: cmdnames.conf,v 1.15 2005/04/08 02:29:17 cpressey Exp $
-# $DragonFly: src/share/installer/cmdnames.conf,v 1.2 2008/07/22 15:42:34 swildner Exp $
+# $DragonFly: src/share/installer/cmdnames.conf,v 1.3 2008/08/30 16:47:47 hasso Exp $
 
 # This is in Bourne shell syntax so that it is easily editable;
 # it is also sourced by the installer, a C program.
@@ -39,7 +39,7 @@ fi
 
 if [ X`sysctl -n kern.ostype` = "XDragonFly" ]; then
        CPDUP="bin/cpdup -o -vvv -u"
-       DHCPD=usr/sbin/dhcpd
+       DHCPD=usr/pkg/sbin/dhcpd
        RPCBIND=usr/sbin/portmap
        MOUNTD=sbin/mountd
        NFSD=sbin/nfsd