Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sparc64/cdroms/installcd Change the install CD to go...
details: https://anonhg.NetBSD.org/src/rev/72b001b833bf
branches: trunk
changeset: 754061:72b001b833bf
user: martin <martin%NetBSD.org@localhost>
date: Sun Apr 18 12:58:57 2010 +0000
description:
Change the install CD to go to full multiuser mode. This clearly
separates the setup done by /etc/rc once, and the repeated stuff
(install.sh invoking sysinst).
diffstat:
distrib/sparc64/cdroms/installcd/Makefile | 16 ++-
distrib/sparc64/cdroms/installcd/dot.profile | 106 ---------------------------
distrib/sparc64/cdroms/installcd/etc.rc | 57 ++++++++++++++
distrib/sparc64/cdroms/installcd/etc.ttys | 7 +
distrib/sparc64/cdroms/installcd/install.sh | 85 +++++++++++++++++++++
5 files changed, 158 insertions(+), 113 deletions(-)
diffs (truncated from 318 to 300 lines):
diff -r d656fc4078ca -r 72b001b833bf distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Sun Apr 18 11:39:39 2010 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Sun Apr 18 12:58:57 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/04/04 23:02:23 martin Exp $
+# $NetBSD: Makefile,v 1.4 2010/04/18 12:58:57 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -16,10 +16,7 @@
CDRUNTIME+= ./dev/MAKEDEV
CDRUNTIME+= ./etc
CDRUNTIME+= ./lib
-CDRUNTIME+= ./libexec/ld.elf_so
-CDRUNTIME+= ./libexec/lfs_cleanerd
-CDRUNTIME+= ./libexec/dhcpcd-run-hooks
-CDRUNTIME+= ./libexec/resolvconf/
+CDRUNTIME+= ./libexec
CDRUNTIME+= ./mnt
CDRUNTIME+= ./sbin
# CDRUNTIME+= ./stand
@@ -46,6 +43,7 @@
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
CDRUNTIME+= ./usr/libexec/ld.elf_so
+CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
CDRUNTIME+= ./usr/sbin/chat
CDRUNTIME+= ./usr/sbin/chown
@@ -57,11 +55,15 @@
CDRUNTIME+= ./usr/share/locale
image_md_pre:
- ${MKDIR} cdrom/libexec/dhcpcd-hooks
+ ${RM} -rf cdrom/libexec/dhcpcd-hooks/*
${CP} ${.CURDIR}/../../../common/10-resolv.conf cdrom/libexec/dhcpcd-hooks
${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
+ ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${MKDIR} cdrom/etc
- ${CP} ${.CURDIR}/dot.profile cdrom/etc/rc
+ ${CP} ${.CURDIR}/etc.ttys cdrom/etc/ttys
+ ${CP} ${.CURDIR}/etc.rc cdrom/etc/rc
+ ${CP} ${.CURDIR}/install.sh cdrom/install.sh
+ ${CHMOD} 0555 cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
${CP} ${SYSINSTDIR}/sysinst cdrom
${CHMOD} ugo+rx cdrom/sysinst
diff -r d656fc4078ca -r 72b001b833bf distrib/sparc64/cdroms/installcd/dot.profile
--- a/distrib/sparc64/cdroms/installcd/dot.profile Sun Apr 18 11:39:39 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-# $NetBSD: dot.profile,v 1.3 2010/04/04 22:56:44 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 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
-
- # run the installation or upgrade script.
- sysinst || {
- echo "Oops, something went wrong - we will try again"; exit; }
-fi
diff -r d656fc4078ca -r 72b001b833bf distrib/sparc64/cdroms/installcd/etc.rc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc64/cdroms/installcd/etc.rc Sun Apr 18 12:58:57 2010 +0000
@@ -0,0 +1,57 @@
+# $NetBSD: etc.rc,v 1.1 2010/04/18 12:58:57 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
+
+# hack to get around bugs in kernfs's rootdev/rrootdev lookup.
+ls -l /dev/* > /dev/null 2>&1
+
+# 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
+
+# create a gettytab to autologin and run sysinst (etc/gettytab is a symlink
+# to /tmp/gettytab)
+echo "# Autostart sysinst" > /tmp/gettytab
+echo -n "sysinst:al=root:lo=/install.sh:im=:sp#" >> /tmp/gettytab
+stty speed >> /tmp/gettytab
+
+# done, move on to multiuser mode
+exit 0
diff -r d656fc4078ca -r 72b001b833bf distrib/sparc64/cdroms/installcd/etc.ttys
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc64/cdroms/installcd/etc.ttys Sun Apr 18 12:58:57 2010 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: etc.ttys,v 1.1 2010/04/18 12:58:57 martin Exp $
+#
+# re-launch the sysinst wrapper script on console
+#
+# name getty type status comments
+#
+console "/usr/libexec/getty sysinst" wsvt25 on secure
diff -r d656fc4078ca -r 72b001b833bf distrib/sparc64/cdroms/installcd/install.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc64/cdroms/installcd/install.sh Sun Apr 18 12:58:57 2010 +0000
@@ -0,0 +1,85 @@
+#! /bin/sh
+# $NetBSD: install.sh,v 1.1 2010/04/18 12:58:57 martin Exp $
+#
+# -
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Martin Husemann <martin%NetBSD.org@localhost>.
+#
+# 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.
+
+
+# setup basic environment
+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
+
+stty newcrt werase ^W intr ^C kill ^U erase ^?
+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:
+
Home |
Main Index |
Thread Index |
Old Index