Module Name: src
Committed By: martin
Date: Sun Apr 4 23:02:23 UTC 2010
Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Cherry-pick the /libexec content for (non miniroot) CDs and add the sysinst
specific dhcpcd hook scripts
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.2 -r1.3 src/distrib/sparc64/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/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.16 src/distrib/i386/cdroms/Makefile.cdrom:1.17
--- src/distrib/i386/cdroms/Makefile.cdrom:1.16 Tue Mar 16 10:16:39 2010
+++ src/distrib/i386/cdroms/Makefile.cdrom Sun Apr 4 23:02:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.16 2010/03/16 10:16:39 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.17 2010/04/04 23:02:23 martin Exp $
.include <bsd.own.mk>
@@ -15,7 +15,10 @@
CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
-CDRUNTIME+= ./libexec
+CDRUNTIME+= ./libexec/ld.elf_so
+CDRUNTIME+= ./libexec/lfs_cleanerd
+CDRUNTIME+= ./libexec/dhcpcd-run-hooks
+CDRUNTIME+= ./libexec/resolvconf/
CDRUNTIME+= ./mnt
CDRUNTIME+= ./sbin
CDRUNTIME+= ./stand
@@ -47,6 +50,9 @@
CDRUNTIME+= ./usr/share/locale
image_md_pre:
+ ${MKDIR} 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
${CP} ${.CURDIR}/../../ramdisks/common/dot.profile cdrom/etc/rc
${ECHO} "" >> cdrom/etc/rc
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.2 src/distrib/sparc64/cdroms/installcd/Makefile:1.3
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.2 Fri Apr 2 21:29:30 2010
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Apr 4 23:02:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/04/02 21:29:30 martin Exp $
+# $NetBSD: Makefile,v 1.3 2010/04/04 23:02:23 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -16,7 +16,10 @@
CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
-CDRUNTIME+= ./libexec
+CDRUNTIME+= ./libexec/ld.elf_so
+CDRUNTIME+= ./libexec/lfs_cleanerd
+CDRUNTIME+= ./libexec/dhcpcd-run-hooks
+CDRUNTIME+= ./libexec/resolvconf/
CDRUNTIME+= ./mnt
CDRUNTIME+= ./sbin
# CDRUNTIME+= ./stand
@@ -54,11 +57,11 @@
CDRUNTIME+= ./usr/share/locale
image_md_pre:
+ ${MKDIR} 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
${CP} ${.CURDIR}/dot.profile cdrom/etc/rc
- ${ECHO} "" >> cdrom/etc/rc
- ${ECHO} "# exit to single user mode" >> cdrom/etc/rc
- ${ECHO} "exit 1" >> cdrom/etc/rc
${MKDIR} cdrom/mnt2 cdrom/targetroot
${CP} ${SYSINSTDIR}/sysinst cdrom
${CHMOD} ugo+rx cdrom/sysinst
