Module Name: src Committed By: tls Date: Sun Aug 10 06:47:49 UTC 2014
Modified Files: src/distrib/amd64/cdroms [tls-earlyentropy]: Makefile.cdrom etc.rc src/distrib/amd64/installimage [tls-earlyentropy]: Makefile Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.8.1 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.1 -r1.1.24.1 src/distrib/amd64/cdroms/etc.rc cvs rdiff -u -r1.3 -r1.3.8.1 src/distrib/amd64/installimage/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.8 src/distrib/amd64/cdroms/Makefile.cdrom:1.8.8.1 --- src/distrib/amd64/cdroms/Makefile.cdrom:1.8 Fri Dec 21 18:11:10 2012 +++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Aug 10 06:47:49 2014 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.cdrom,v 1.8 2012/12/21 18:11:10 christos Exp $ +# $NetBSD: Makefile.cdrom,v 1.8.8.1 2014/08/10 06:47:49 tls Exp $ .include <bsd.own.mk> -SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} # Need multidot for the boot loader to read kernel modules as it doesn't # understand rockridge. @@ -35,6 +35,7 @@ CDRUNTIME+= ./usr/bin/sed CDRUNTIME+= ./usr/bin/sort CDRUNTIME+= ./usr/bin/tip CDRUNTIME+= ./usr/bin/tput +CDRUNTIME+= ./usr/bin/vi CDRUNTIME+= ./usr/bin/vmstat CDRUNTIME+= ./usr/lib/libbz2.so* CDRUNTIME+= ./usr/lib/libc.so* Index: src/distrib/amd64/cdroms/etc.rc diff -u src/distrib/amd64/cdroms/etc.rc:1.1 src/distrib/amd64/cdroms/etc.rc:1.1.24.1 --- src/distrib/amd64/cdroms/etc.rc:1.1 Tue Jan 18 00:16:13 2011 +++ src/distrib/amd64/cdroms/etc.rc Sun Aug 10 06:47:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: etc.rc,v 1.1 2011/01/18 00:16:13 jym Exp $ +# $NetBSD: etc.rc,v 1.1.24.1 2014/08/10 06:47:49 tls Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -44,8 +44,8 @@ mount -t tmpfs tmpfs /tmp mount -t tmpfs tmpfs /var mount -t tmpfs -o union tmpfs /etc -# prepare important directories in the tmpfses, so dhcpcd will work -mkdir -p /var/run /var/db +# prepare important directories in the tmpfses, so dhcpcd and vi will work +mkdir -p /var/run /var/db /var/tmp # create a gettytab to autologin and run sysinst (etc/gettytab is a symlink # to /tmp/gettytab) Index: src/distrib/amd64/installimage/Makefile diff -u src/distrib/amd64/installimage/Makefile:1.3 src/distrib/amd64/installimage/Makefile:1.3.8.1 --- src/distrib/amd64/installimage/Makefile:1.3 Sat Nov 3 14:25:32 2012 +++ src/distrib/amd64/installimage/Makefile Sun Aug 10 06:47:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/11/03 14:25:32 tsutsui Exp $ +# $NetBSD: Makefile,v 1.3.8.1 2014/08/10 06:47:49 tls Exp $ .include <bsd.own.mk> @@ -22,7 +22,7 @@ prepare_md_post: < ${.CURDIR}/boot.cfg.in > boot.cfg DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd -SYSINSTDIR!= cd ${DISTRIBDIR}/utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} +SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} SPEC_EXTRA= ${.CURDIR}/spec.inst IMGFILE_EXTRA= \