Module Name: src
Committed By: martin
Date: Fri Apr 2 21:29:30 UTC 2010
Modified Files:
src/distrib/sparc64/bootfs: Makefile list
src/distrib/sparc64/cdroms/installcd: Makefile
Added Files:
src/distrib/sparc64/bootfs: boot.cfg
src/distrib/sparc64/cdroms/installcd: dot.profile
Log Message:
Move install CDs over to / on cd9660 (instead of a memory disk image)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sparc64/bootfs/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/bootfs/boot.cfg
cvs rdiff -u -r1.3 -r1.4 src/distrib/sparc64/bootfs/list
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/sparc64/cdroms/installcd/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/bootfs/Makefile
diff -u src/distrib/sparc64/bootfs/Makefile:1.8 src/distrib/sparc64/bootfs/Makefile:1.9
--- src/distrib/sparc64/bootfs/Makefile:1.8 Fri Mar 12 23:07:13 2010
+++ src/distrib/sparc64/bootfs/Makefile Fri Apr 2 21:29:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/03/12 23:07:13 martin Exp $
+# $NetBSD: Makefile,v 1.9 2010/04/02 21:29:30 martin Exp $
#
# boot.fs is the image for cdrom booting.
#
@@ -15,7 +15,7 @@
.include <bsd.kernobj.mk>
IMAGE= boot.fs
-IMAGESIZE= 9m
+IMAGESIZE= 1m
IMAGEENDIAN= be
LISTS= ${.CURDIR}/list
@@ -26,9 +26,8 @@
PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootblk
PARSELISTENV= RAMDISKDIR=${RAMDISKDIR:Q}
-IMAGEDEPENDS= ${RAMDISKDIR}/netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/ofwboot \
- ${PRIMARYBOOT}
-IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT} /boot
+IMAGEDEPENDS= ${DESTDIR}/usr/mdec/ofwboot ${PRIMARYBOOT}
+IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT}
IMAGE_RELEASEDIR= installation/misc
Index: src/distrib/sparc64/bootfs/list
diff -u src/distrib/sparc64/bootfs/list:1.3 src/distrib/sparc64/bootfs/list:1.4
--- src/distrib/sparc64/bootfs/list:1.3 Mon Nov 18 12:39:55 2002
+++ src/distrib/sparc64/bootfs/list Fri Apr 2 21:29:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.3 2002/11/18 12:39:55 lukem Exp $
+# $NetBSD: list,v 1.4 2010/04/02 21:29:30 martin Exp $
-COPY ${DESTDIR}/usr/mdec/ofwboot ofwboot
-COPY ${RAMDISKDIR}/netbsd-INSTALL.gz netbsd
+COPY ${DESTDIR}/usr/mdec/ofwboot ofwboot
+COPY ${NETBSDSRCDIR}/distrib/sparc64/bootfs/boot.cfg boot.cfg
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.1 src/distrib/sparc64/cdroms/installcd/Makefile:1.2
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.1 Tue Mar 6 21:57:24 2007
+++ src/distrib/sparc64/cdroms/installcd/Makefile Fri Apr 2 21:29:30 2010
@@ -1,13 +1,72 @@
-# $NetBSD: Makefile,v 1.1 2007/03/06 21:57:24 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/02 21:29:30 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
# for PRINTOBJDIR
.include <bsd.own.mk>
+SYSINSTDIR!= cd ${.CURDIR}/../../../utils/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+CDRELEASE_NOISOS= true
CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs
SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE}
+
+CDRUNTIME+= ./bin
+CDRUNTIME+= ./dev/MAKEDEV
+CDRUNTIME+= ./etc
+CDRUNTIME+= ./lib
+CDRUNTIME+= ./libexec
+CDRUNTIME+= ./mnt
+CDRUNTIME+= ./sbin
+# CDRUNTIME+= ./stand
+CDRUNTIME+= ./tmp
+CDRUNTIME+= ./usr/bin/ftp
+CDRUNTIME+= ./usr/bin/gzcat
+CDRUNTIME+= ./usr/bin/gzip
+CDRUNTIME+= ./usr/bin/gunzip
+CDRUNTIME+= ./usr/bin/grep
+CDRUNTIME+= ./usr/bin/less
+CDRUNTIME+= ./usr/bin/more
+CDRUNTIME+= ./usr/bin/netstat
+CDRUNTIME+= ./usr/bin/progress
+CDRUNTIME+= ./usr/bin/sed
+CDRUNTIME+= ./usr/bin/sort
+CDRUNTIME+= ./usr/bin/tip
+CDRUNTIME+= ./usr/bin/vmstat
+CDRUNTIME+= ./usr/lib/libbz2.so*
+CDRUNTIME+= ./usr/lib/libc.so*
+CDRUNTIME+= ./usr/lib/libcurses.so*
+CDRUNTIME+= ./usr/lib/libedit.so*
+CDRUNTIME+= ./usr/lib/libkvm.so*
+CDRUNTIME+= ./usr/lib/libterminfo.so*
+CDRUNTIME+= ./usr/lib/libutil.so*
+CDRUNTIME+= ./usr/lib/libz.so*
+CDRUNTIME+= ./usr/libexec/ld.elf_so
+CDRUNTIME+= ./usr/mdec
+CDRUNTIME+= ./usr/sbin/chat
+CDRUNTIME+= ./usr/sbin/chown
+CDRUNTIME+= ./usr/sbin/chroot
+CDRUNTIME+= ./usr/sbin/installboot
+CDRUNTIME+= ./usr/sbin/pppd
+CDRUNTIME+= ./usr/sbin/wiconfig
+CDRUNTIME+= ./usr/share/misc/terminfo.db
+CDRUNTIME+= ./usr/share/locale
+
+image_md_pre:
+ ${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
+ ${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+ ${MKDIR} cdrom/var
+ ${MKDIR} cdrom/kern
+ ${CP} ${RELEASEDIR}/sparc64/binary/kernel/netbsd-GENERIC.gz cdrom/netbsd
+
image_md_post:
SUNLABEL=${TOOL_SUNLABEL:Q} \
${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
Added files:
Index: src/distrib/sparc64/bootfs/boot.cfg
diff -u /dev/null src/distrib/sparc64/bootfs/boot.cfg:1.1
--- /dev/null Fri Apr 2 21:29:30 2010
+++ src/distrib/sparc64/bootfs/boot.cfg Fri Apr 2 21:29:30 2010
@@ -0,0 +1 @@
+bootpartition :a
Index: src/distrib/sparc64/cdroms/installcd/dot.profile
diff -u /dev/null src/distrib/sparc64/cdroms/installcd/dot.profile:1.1
--- /dev/null Fri Apr 2 21:29:30 2010
+++ src/distrib/sparc64/cdroms/installcd/dot.profile Fri Apr 2 21:29:30 2010
@@ -0,0 +1,110 @@
+# $NetBSD: dot.profile,v 1.1 2010/04/02 21:29:30 martin Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed for the
+# NetBSD Project. See http://www.NetBSD.org/ for
+# information about NetBSD.
+# 4. The name of the author may not be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+
+PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
+export PATH
+
+# Check if we are on a framebuffer or on serial console and default
+# the terminal type accordingly.
+# There is no /var/db/dev.db, so sysctl might not map the devicename properly;
+# ttyE0 is 90,0 -> 0x5a00
+case $(sysctl -nx kern.consdev) in
+ 0000000000005a0*)
+ TERM=wsvt25
+ ;;
+ *)
+ TERM=vt220
+ ;;
+esac
+
+export TERM
+HOME=/
+export HOME
+BLOCKSIZE=1k
+export BLOCKSIZE
+EDITOR=ed
+export EDITOR
+
+umask 022
+
+if [ "X${DONEPROFILE}" = "X" ]; then
+ DONEPROFILE=YES
+ export DONEPROFILE
+
+ # set up some sane defaults
+ echo 'erase ^?, werase ^W, kill ^U, intr ^C'
+ stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
+ echo ''
+
+ if [ $TERM != "wsvt25" ]; then
+ cat << "EOM"
+You are using a serial console, we do not know your terminal emulation.
+Please select one, typical values are:
+
+ vt100
+ ansi
+ xterm
+
+EOM
+ echo -n "Terminal type (just hit ENTER for '$TERM'): "
+ read ans
+ if [ -n "$ans" ];then
+ TERM=$ans
+ fi
+ fi
+
+ # mount the kern_fs so that we can find the root device, and also
+ # examine the dmesg state
+ mount -t kernfs /kern /kern
+
+ # hack to get around bugs in kernfs's rootdev/rrootdev lookup.
+ ls -l /dev/* > /dev/null 2>&1
+
+ # mount the ramdisk read write
+ mount -t -r cd9660 -u /kern/rootdev /
+
+ # mount a few tempfs to allow modifications over the CD contents
+ 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
+ echo > /tmp/dhcpcd-lease
+
+ # run the installation or upgrade script.
+ sysinst || {
+ echo "Oops, something went wrong - we will try again"; exit; }
+fi
