Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Punt custom dhcpcd hooks in favour up upstream hooks

This commit is contained in:
roy 2014-09-13 10:18:24 +00:00
parent 1c37fe7141
commit 4b34ebf614
8 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distrib/amd64/cdroms/Makefile.cdrom
View File

@ -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.cdb
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

4
distrib/amd64/installimage/Makefile
View File

@ -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.sbin/sysinst/arch/${MACHINE} && ${PRINTO
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 . \

5
distrib/amd64/installimage/spec.inst
View File

@ -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

5
distrib/i386/cdroms/Makefile.cdrom
View File

@ -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.cdb
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

4
distrib/i386/installimage/Makefile
View File

@ -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.sbin/sysinst/arch/${MACHINE} && ${PRINTO
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 . \

5
distrib/i386/installimage/spec.inst
View File

@ -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

5
distrib/sparc64/cdroms/installcd/Makefile
View File

@ -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.cdb
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

6
distrib/vax/cdroms/installcd/Makefile
View File

@ -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