Upgrade pieces for new dhclient and dhcpd/dhcrelay removal.
authorHasso Tepper <hasso@dragonflybsd.org>
Sat, 30 Aug 2008 16:34:29 +0000 (16:34 +0000)
committerHasso Tepper <hasso@dragonflybsd.org>
Sat, 30 Aug 2008 16:34:29 +0000 (16:34 +0000)
Makefile_upgrade.inc
etc/Makefile

index 6a4ed9d..becc6c0 100644 (file)
@@ -1,4 +1,4 @@
-# $DragonFly: src/Makefile_upgrade.inc,v 1.32 2008/08/29 23:06:37 swildner Exp $
+# $DragonFly: src/Makefile_upgrade.inc,v 1.33 2008/08/30 16:34:28 hasso Exp $
 #
 # Append all obsolete files to this file
 # Avoid constructs like {foo,bar}.  It is parsed by /bin/sh
@@ -955,3 +955,15 @@ TO_REMOVE+=/usr/include/sysids.h
 TO_REMOVE+=/usr/include/uiutil.h
 TO_REMOVE+=/usr/share/man/cat4/i386/acpi_toshiba.4.gz
 TO_REMOVE+=/usr/share/man/man4/i386/acpi_toshiba.4.gz
+TO_REMOVE+=/etc/rc.d/dhcpd
+TO_REMOVE+=/etc/rc.d/dhcrelay
+TO_REMOVE+=/usr/sbin/dhcpd
+TO_REMOVE+=/usr/sbin/dhcrelay
+TO_REMOVE+=/usr/share/man/cat5/dhcpd.conf.5.gz
+TO_REMOVE+=/usr/share/man/man5/dhcpd.conf.5.gz
+TO_REMOVE+=/usr/share/man/cat5/dhcpd.leases.5.gz
+TO_REMOVE+=/usr/share/man/man5/dhcpd.leases.5.gz
+TO_REMOVE+=/usr/share/man/cat8/dhcpd.8.gz
+TO_REMOVE+=/usr/share/man/man8/dhcpd.8.gz
+TO_REMOVE+=/usr/share/man/cat8/dhcrelay.8.gz
+TO_REMOVE+=/usr/share/man/man8/dhcrelay.8.gz
index 0f21788..75bf1e1 100644 (file)
@@ -1,6 +1,6 @@
 #      from: @(#)Makefile      5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.213 2008/08/03 01:01:51 swildner Exp $
+# $DragonFly: src/etc/Makefile,v 1.214 2008/08/30 16:34:29 hasso Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=        sendmail
@@ -125,12 +125,18 @@ preupgrade:
                pw -V ${DESTDIR}/etc useradd _sdpd -u 70 \
                   -c "sdpd privsep user" \
                   -d /var/empty -s /sbin/nologin
+       (pw -V ${DESTDIR}/etc usershow _dhcp -q > /dev/null) || \
+               pw -V ${DESTDIR}/etc useradd _dhcp -u 77 \
+                  -c "DHCP programs" \
+                  -d /var/empty -s /sbin/nologin
        (pw -V ${DESTDIR}/etc groupshow authpf -q > /dev/null) || \
                pw -V ${DESTDIR}/etc groupadd authpf -g 63
        (pw -V ${DESTDIR}/etc groupshow _pflogd -q > /dev/null) || \
                pw -V ${DESTDIR}/etc groupadd _pflogd -g 64
        (pw -V ${DESTDIR}/etc groupshow _sdpd -q > /dev/null) || \
                pw -V ${DESTDIR}/etc groupadd _sdpd -g 70
+       (pw -V ${DESTDIR}/etc groupshow _dhcp -q > /dev/null) || \
+               pw -V ${DESTDIR}/etc groupadd _dhcp -g 77
 
 upgrade_etc:   preupgrade remove-obsolete-files
 .if !defined(BINARY_UPGRADE) # binary upgrade just copies these files