Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src All apply to vax only:
details: https://anonhg.NetBSD.org/src/rev/db8d57ddb1a5
branches: trunk
changeset: 779982:db8d57ddb1a5
user: abs <abs%NetBSD.org@localhost>
date: Tue Jul 03 21:49:55 2012 +0000
description:
All apply to vax only:
- Drop KERNFS from INSTALL kernel
- Add dmesg to sysinst ramdisk
- Add 'ramdisk' target to MAKEDEV and use
- Add dhcpcd to sysinst ramdisk
- Drop old install.md script
- Misc install image cleanup (reduce diff to zaurus of all things)
diffstat:
distrib/vax/install.md | 262 --------------------------------------
distrib/vax/miniroot/Makefile.inc | 5 +-
distrib/vax/miniroot/list | 3 +-
distrib/vax/ramdisk/Makefile | 8 +-
distrib/vax/ramdisk/dot.profile | 10 +-
distrib/vax/ramdisk/list | 9 +-
etc/etc.vax/MAKEDEV.conf | 9 +-
sys/arch/vax/conf/INSTALL | 4 +-
8 files changed, 27 insertions(+), 283 deletions(-)
diffs (truncated from 450 to 300 lines):
diff -r efef67a368bf -r db8d57ddb1a5 distrib/vax/install.md
--- a/distrib/vax/install.md Tue Jul 03 21:35:04 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-# $NetBSD: install.md,v 1.5 2008/04/30 13:10:49 martin Exp $
-#
-#
-# Copyright (c) 1996 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Jason R. Thorpe.
-#
-# 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``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 FOUNDATION OR CONTRIBUTORS
-# 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.
-#
-
-#
-# machine dependent section of installation/upgrade script.
-#
-
-# Machine-dependent install sets
-MDSETS="kern xbase xcomp xfont xserver"
-
-if [ "$MODE" = upgrade ]; then
- RELOCATED_FILES_13="${RELOCATED_FILES_13} /usr/sbin/installboot /usr/mdec/installboot"
-fi
-
-# Mount /kern to get at /kern/msgbuf
-mount -t kernfs none /kern
-
-md_set_term() {
- if [ ! -z "$TERM" ]; then
- return
- fi
- echo -n "Specify terminal type [vt100]: "
- getresp "vt100"
- TERM="$resp"
- export TERM
-}
-
-md_makerootwritable() {
- # Was: do_mfs_mount "/tmp" "2048"
- # /tmp is the mount point
- # 2048 is the size in DEV_BIZE blocks
-
- umount /tmp > /dev/null 2>&1
- if ! mount_mfs -s 2048 swap /tmp ; then
- cat << \__mfs_failed_1
-
-FATAL ERROR: Can't mount the memory filesystem.
-
-__mfs_failed_1
- exit
- fi
-
- # Bleh. Give mount_mfs a chance to DTRT.
- sleep 2
-}
-
-md_get_diskdevs() {
- # return available disk devices
- < /kern/msgbuf sed -n -e 's/^\(sd[0-9]\) .*/\1/p' -e 's/^\(ra[0-9]\) .*/\1/p' | sort -u
-}
-
-md_get_cddevs() {
- # return available CDROM devices
- < /kern/msgbuf sed -n -e 's/^\(cd[0-9]\) .*/\1/p' | sort -u
-}
-
-md_get_ifdevs() {
- # return available network devices
- < /kern/msgbuf sed -n -e 's/^\([dlqz]e[0-9]\) .*/\1/p' | sort -u
-}
-
-md_get_partition_range() {
- # return range of valid partition letters
- echo "[a-h]"
-}
-
-md_installboot() {
- echo "Installing boot block..."
- /sbin/disklabel -B $1
-}
-
-md_native_fstype() {
-}
-
-md_native_fsopts() {
-}
-
-md_checkfordisklabel() {
- # $1 is the disk to check
- local rval
- local cfdl
-
- cfdl=`disklabel $1 2>&1 > /dev/null | \
- sed -n -e '/no disk label/{s/.*/ndl/p;q;}; \
- /disk label corrupted/{s/.*/dlc/p;q;}; \
- $s/.*/no/p'`
- if [ x$cfdl = xndl ]; then
- rval=1
- elif [ x$cfdl = xdlc ]; then
- rval=2
- else
- rval=0
- fi
-
- return $rval
-}
-
-md_prep_disklabel()
-{
- local _disk
-
- _disk=$1
- md_checkfordisklabel $_disk
- case $? in
- 0)
- echo -n "Do you wish to edit the disklabel on $_disk? [y]"
- ;;
- 1)
- echo "WARNING: Disk $_disk has no label"
- echo -n "Do you want to create one with the disklabel editor? [y]"
- ;;
- 2)
- echo "WARNING: Label on disk $_disk is corrupted"
- echo -n "Do you want to try and repair the damage using the disklabel editor? [y]"
- ;;
- esac
-
- getresp "y"
- case "$resp" in
- y*|Y*) ;;
- *) return ;;
- esac
-
- # display example
- cat << \__md_prep_disklabel_1
-
-Here is an example of what the partition information will look like once
-you have entered the disklabel editor. Disk partition sizes and offsets
-are in sector (most likely 512 bytes) units. Make sure these size/offset
-pairs are on cylinder boundaries (the number of sector per cylinder is
-given in the `sectors/cylinder' entry, which is not shown here).
-
-Do not change any parameters except the partition layout and the label name.
-It's probably also wisest not to touch the `8 partitions:' line, even
-in case you have defined less than eight partitions.
-
-[Example]
-8 partitions:
-# size offset fstype [fsize bsize cpg]
- a: 50176 0 4.2BSD 1024 8192 16 # (Cyl. 0 - 111)
- b: 64512 50176 swap # (Cyl. 112 - 255)
- c: 640192 0 unknown # (Cyl. 0 - 1428)
- d: 525504 114688 4.2BSD 1024 8192 16 # (Cyl. 256 - 1428)
-[End of example]
-
-__md_prep_disklabel_1
- echo -n "Press [Enter] to continue "
- getresp ""
- disklabel -W ${_disk}
- if [ -f /usr/bin/vi ]; then
- disklabel -e ${_disk}
- else
- disklabel -i ${_disk}
- fi
-}
-
-md_copy_kernel() {
- if [ -f /mnt/netbsd-GENERIC ]; then
- echo -n "Linking /netbsd-GENERIC to /netbsd ... "
- ln /mnt/netbsd-GENERIC /mnt/netbsd
- echo "done."
- else
- echo "WARNING: No /netbsd-GENERIC! Please install /netbsd manually!"
- fi
-}
-
-md_welcome_banner() {
-{
- if [ "$MODE" = "install" ]; then
- echo ""
- echo "Welcome to the NetBSD/vax ${VERSION} installation program."
- cat << \__welcome_banner_1
-
-This program is designed to help you put NetBSD on your disk,
-in a simple and rational way. You'll be asked several questions,
-and it would probably be useful to have your disk's hardware
-manual, the installation notes, and a calculator handy.
-__welcome_banner_1
-
- else
- echo ""
- echo "Welcome to the NetBSD/vax ${VERSION} upgrade program."
- cat << \__welcome_banner_2
-
-This program is designed to help you upgrade your NetBSD system in a
-simple and rational way.
-
-As a reminder, installing the `etc' binary set is NOT recommended.
-Once the rest of your system has been upgraded, you should manually
-merge any changes to files in the `etc' set into those files which
-already exist on your system.
-__welcome_banner_2
- fi
-
-cat << \__welcome_banner_3
-
-As with anything which modifies your disk's contents, this
-program can cause SIGNIFICANT data loss, and you are advised
-to make sure your data is backed up before beginning the
-installation process.
-
-Default answers are displayed in brackets after the questions.
-You can hit Control-C at any time to quit, but if you do so at a
-prompt, you may have to hit return. Also, quitting in the middle of
-installation may leave your system in an inconsistent state.
-
-__welcome_banner_3
-} | more
-}
-
-md_not_going_to_install() {
- cat << \__not_going_to_install_1
-
-OK, then. Enter `halt' at the prompt to halt the machine. Once the
-machine has halted, power-cycle the system to load new boot code.
-
-__not_going_to_install_1
-}
-
-md_congrats() {
- local what;
- if [ "$MODE" = "install" ]; then
- what="installed";
- else
- what="upgraded";
- fi
- cat << __congratulations_1
-
-CONGRATULATIONS! You have successfully $what NetBSD!
-To boot the installed system, enter halt at the command prompt. Once the
-system has halted, reset the machine and boot from the disk.
-
-__congratulations_1
-}
diff -r efef67a368bf -r db8d57ddb1a5 distrib/vax/miniroot/Makefile.inc
--- a/distrib/vax/miniroot/Makefile.inc Tue Jul 03 21:35:04 2012 +0000
+++ b/distrib/vax/miniroot/Makefile.inc Tue Jul 03 21:49:55 2012 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.21 2012/07/02 22:42:18 abs Exp $
+# $NetBSD: Makefile.inc,v 1.22 2012/07/03 21:49:55 abs Exp $
IMAGESIZE= 7m
MAKEFS_FLAGS= -o density=3k
IMAGEENDIAN= le
MAKEDEVTARGETS= all
LISTS+= ${DISTRIBDIR}/common/list.sysinst
-IMAGEDEPENDS+= ${ARCHDIR}/../install.md \
- ${ARCHDIR}/dot.profile \
+IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \
${DESTDIR}/usr/mdec/boot \
${KERNOBJDIR}/GENERIC/netbsd
diff -r efef67a368bf -r db8d57ddb1a5 distrib/vax/miniroot/list
--- a/distrib/vax/miniroot/list Tue Jul 03 21:35:04 2012 +0000
+++ b/distrib/vax/miniroot/list Tue Jul 03 21:49:55 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.14 2011/07/03 23:11:34 tron Exp $
+# $NetBSD: list,v 1.15 2012/07/03 21:49:55 abs Exp $
# Vax extras
PROG sbin/disklabel
@@ -36,5 +36,4 @@
# and the installation tools
COPY ${ARCHDIR}/dot.profile .profile
-COPY ${ARCHDIR}/../install.md install.md
COPY ${DESTDIR}/usr/mdec/boot boot
diff -r efef67a368bf -r db8d57ddb1a5 distrib/vax/ramdisk/Makefile
Home |
Main Index |
Thread Index |
Old Index