[src/trunk]: src/distrib Cherry-pick the /libexec content for (non miniroot) ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/02753f03c8d1
branches:  trunk
changeset: 753630:02753f03c8d1
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Apr 04 23:02:23 2010 +0000

description:
Cherry-pick the /libexec content for (non miniroot) CDs and add the sysinst
specific dhcpcd hook scripts

diffstat:

 distrib/i386/cdroms/Makefile.cdrom        |  10 ++++++++--
 distrib/sparc64/cdroms/installcd/Makefile |  13 ++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diffs (67 lines):

diff -r 2b60ad9a3bc9 -r 02753f03c8d1 distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Sun Apr 04 22:56:44 2010 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Sun Apr 04 23:02:23 2010 +0000
@@ -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
diff -r 2b60ad9a3bc9 -r 02753f03c8d1 distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Sun Apr 04 22:56:44 2010 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Sun Apr 04 23:02:23 2010 +0000
@@ -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