Module Name: src
Committed By: roy
Date: Sat Sep 13 10:18:24 UTC 2014
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/installimage: Makefile spec.inst
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/installimage: Makefile spec.inst
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/vax/cdroms/installcd: Makefile
Log Message:
Punt custom dhcpcd hooks in favour up upstream hooks
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/spec.inst
cvs rdiff -u -r1.31 -r1.32 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/installimage/spec.inst
cvs rdiff -u -r1.19 -r1.20 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.11 src/distrib/amd64/cdroms/Makefile.cdrom:1.12
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.11 Thu Aug 14 16:27:17 2014
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sat Sep 13 10:18:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.11 2014/08/14 16:27:17 riastradh Exp $
+# $NetBSD: Makefile.cdrom,v 1.12 2014/09/13 10:18:24 roy Exp $
.include <bsd.own.mk>
@@ -65,9 +65,6 @@ CDRUNTIME+= ./usr/share/misc/terminfo.cd
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${MKDIR} cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.4 src/distrib/amd64/installimage/Makefile:1.5
--- src/distrib/amd64/installimage/Makefile:1.4 Sat Jul 26 19:34:08 2014
+++ src/distrib/amd64/installimage/Makefile Sat Sep 13 10:18:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2014/09/13 10:18:24 roy Exp $
.include <bsd.own.mk>
@@ -26,8 +26,6 @@ SYSINSTDIR!= cd ${.CURDIR}/../../../usr.
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA= \
- ${DISTRIBDIR}/common/10-resolv.conf libexec/dhcpcd-hooks \
- ${DISTRIBDIR}/common/99-print-sysinst libexec/dhcpcd-hooks \
${.CURDIR}/etc.ttys etc/ttys \
${.CURDIR}/etc.rc etc/rc \
${.CURDIR}/install.sh . \
Index: src/distrib/amd64/installimage/spec.inst
diff -u src/distrib/amd64/installimage/spec.inst:1.1 src/distrib/amd64/installimage/spec.inst:1.2
--- src/distrib/amd64/installimage/spec.inst:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/installimage/spec.inst Sat Sep 13 10:18:24 2014
@@ -1,10 +1,7 @@
-# $NetBSD: spec.inst,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: spec.inst,v 1.2 2014/09/13 10:18:24 roy Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 uname=root gname=wheel
-./libexec/dhcpcd-hooks/10-resolv.conf type=file mode=0444 uname=root gname=wheel
-./libexec/dhcpcd-hooks/99-print-sysinst type=file mode=0444 uname=root gname=wheel
-
./install.sh type=file mode=0755 uname=root gname=wheel
./sysinst type=file mode=0755 uname=root gname=wheel
./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.31 src/distrib/i386/cdroms/Makefile.cdrom:1.32
--- src/distrib/i386/cdroms/Makefile.cdrom:1.31 Thu Aug 14 16:27:18 2014
+++ src/distrib/i386/cdroms/Makefile.cdrom Sat Sep 13 10:18:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.31 2014/08/14 16:27:18 riastradh Exp $
+# $NetBSD: Makefile.cdrom,v 1.32 2014/09/13 10:18:24 roy Exp $
.include <bsd.own.mk>
@@ -65,9 +65,6 @@ CDRUNTIME+= ./usr/share/misc/terminfo.cd
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${MKDIR} cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${INSTALL} ${COPY} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
Index: src/distrib/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.4 src/distrib/i386/installimage/Makefile:1.5
--- src/distrib/i386/installimage/Makefile:1.4 Sat Jul 26 19:34:08 2014
+++ src/distrib/i386/installimage/Makefile Sat Sep 13 10:18:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/07/26 19:34:08 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2014/09/13 10:18:24 roy Exp $
.include <bsd.own.mk>
@@ -26,8 +26,6 @@ SYSINSTDIR!= cd ${.CURDIR}/../../../usr.
SPEC_EXTRA= ${.CURDIR}/spec.inst
IMGFILE_EXTRA= \
- ${DISTRIBDIR}/common/10-resolv.conf libexec/dhcpcd-hooks \
- ${DISTRIBDIR}/common/99-print-sysinst libexec/dhcpcd-hooks \
${.CURDIR}/etc.ttys etc/ttys \
${.CURDIR}/etc.rc etc/rc \
${.CURDIR}/install.sh . \
Index: src/distrib/i386/installimage/spec.inst
diff -u src/distrib/i386/installimage/spec.inst:1.1 src/distrib/i386/installimage/spec.inst:1.2
--- src/distrib/i386/installimage/spec.inst:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/installimage/spec.inst Sat Sep 13 10:18:24 2014
@@ -1,10 +1,7 @@
-# $NetBSD: spec.inst,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: spec.inst,v 1.2 2014/09/13 10:18:24 roy Exp $
./mnt2 type=dir mode=0755 uname=root gname=wheel
./targetroot type=dir mode=0755 uname=root gname=wheel
-./libexec/dhcpcd-hooks/10-resolv.conf type=file mode=0444 uname=root gname=wheel
-./libexec/dhcpcd-hooks/99-print-sysinst type=file mode=0444 uname=root gname=wheel
-
./install.sh type=file mode=0755 uname=root gname=wheel
./sysinst type=file mode=0755 uname=root gname=wheel
./sysinstmsgs.de type=file mode=0444 uname=root gname=wheel
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.19 src/distrib/sparc64/cdroms/installcd/Makefile:1.20
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.19 Thu Aug 14 16:27:18 2014
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sat Sep 13 10:18:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/08/14 16:27:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2014/09/13 10:18:24 roy Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -68,9 +68,6 @@ CDRUNTIME+= ./usr/share/misc/terminfo.cd
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${RM} -rf cdrom/libexec/dhcpcd-hooks/*
- ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.9 src/distrib/vax/cdroms/installcd/Makefile:1.10
--- src/distrib/vax/cdroms/installcd/Makefile:1.9 Thu Aug 14 16:27:18 2014
+++ src/distrib/vax/cdroms/installcd/Makefile Sat Sep 13 10:18:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/08/14 16:27:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2014/09/13 10:18:24 roy Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
@@ -17,10 +17,6 @@ image_md_pre:
${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot
${RM} -f bootxx.${MACHINE}
${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
- ${RM} -rf cdrom/libexec/dhcpcd-hooks/*
- ${MKDIR} -p cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
- ${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
